mm_api 1.1.1 → 1.1.3

package/lib/api.js

@@ -19,6 +19,10 @@ function loadOptional(id) {
 }
 
 const Param = loadOptional("mm_param/lib/param.js"); // 是MM自带的参数机制，可以不使用
+// sql驱动：优先使用 mm_dao 的 Dao（dao.json 查询构建器，契约 run(query, body, db)），
+// 回退到 mm_sql 的 Sql（仅支持 run(sql, param, timeout) 原始SQL执行）
+const mm_dao = loadOptional("mm_dao");
+const Dao = mm_dao ? mm_dao.Dao : null;
 const Sql = loadOptional("mm_sql/lib/sql.js"); // 是MM自带的sql机制，可以不使用
 
 /** param 实例缓存（模块级，替代原全局 param 模块列表） */
@@ -268,6 +272,7 @@ Api.prototype._loadParam = function (file_path) {
   if (!cfg) {
     return null;
   }
+  cfg.name = cfg.name || this.config.name;
   cfg.config_file = p;
   cfg.dir = path.dirname(p);
   this.param = new Param(cfg, this);
@@ -296,11 +301,15 @@ Api.prototype.getSql = function (file) {
 
 /**
  * 加载sql模板配置（方案B：读取 sql.json 作为驱动配置，替代旧脚本动态加载）
+ * 优先用 mm_dao 的 Dao 构建驱动：Dao 实现了 run(query, body, db) 的旧契约，
+ * 能按 sql.json/dao.json 配置将请求参数拼装成 SQL，并通过第三参传入的
+ * 数据管理器（db 或 db.new(table) 表模型）执行。仅当 mm_dao 缺失时才
+ * 回退到 mm_sql 的 Sql（只支持 run(sql, param, timeout) 原始SQL）。
  * @param {string} file_path sql模板文件路径
  * @returns {object|null} sql驱动实例，未配置或加载失败返回 null
  */
 Api.prototype._loadSql = function (file_path) {
-  if (!file_path || !Sql) {
+  if (!file_path || (!Dao && !Sql)) {
     return null;
   }
   var p = file.fullname(file_path, this.getDir());
@@ -316,7 +325,11 @@ Api.prototype._loadSql = function (file_path) {
   cfg.name = cfg.name || this.config.name;
   cfg.config_file = p;
   cfg.dir = path.dirname(p);
-  this.sql = new Sql(cfg, this);
+  if (Dao) {
+    this.sql = new Dao(cfg, this);
+  } else {
+    this.sql = new Sql(cfg, this);
+  }
   this.updateSql(this.sql);
   return this.sql;
 };
@@ -450,7 +463,7 @@ Api.prototype.saveFile = function (files) {
  * @private
  */
 Api.prototype._getState = async function (db, token) {
-  var db1 = db.new("user_state", "user_id");
+  var db1 = db.new("sys_user_state", "user_id");
   var state = await db1.getObj(
     {
       token,
@@ -464,7 +477,7 @@ Api.prototype._getState = async function (db, token) {
   }
   var now = new Date();
   if (date.interval(state.time_sign, now, "day") <= 30) {
-    db.table = "user_account";
+    db.table = "sys_user";
     var user = await db.getObj({
       user_id: state.user_id,
     });

package/lib/manager.js

@@ -228,6 +228,7 @@ ApiManager.prototype.run = async function (ctx, options = {}) {
   let args = this._getRunArgs(ctx, options, arguments[2]);
   let path = args.ctx.request.path;
   let drives = this._sortedDrives();
+  let result = null;
 
   for (var i = 0; i < drives.length; i++) {
     var mod = drives[i];
@@ -237,12 +238,15 @@ ApiManager.prototype.run = async function (ctx, options = {}) {
       }
       var ret = await mod.run(args.params, args.ctx, args.options);
       if (ret) {
+        // 同时写入上下文与数据管理器，兼容两种结果读取方式
         args.ctx.result = ret;
+        args.options.ret = ret;
+        result = ret;
         break;
       }
     }
   }
-  return args.ctx.result;
+  return result;
 };
 
 /**

package/package.json

@@ -1,34 +1,36 @@
 {
-  "name": "mm_api",
-  "version": "1.1.1",
-  "description": "API框架，用于实现web api和mvc模式路由请求，负责配置路由路径、访问权限、校验机制；基于 mm_corejs，内置管理器池，无全局/原型扩展依赖",
-  "main": "index.js",
-  "keywords": [
-    "mm_mod",
-    "mm_port",
-    "mm_in_port",
-    "api",
-    "mvc",
-    "router",
-    "oauth",
-    "API管理器"
-  ],
-  "layer": "port",
-  "group": "web",
-  "author": "邱文武",
-  "license": "ISC",
-  "repository": {
-    "type": "git",
-    "url": "git+https://gitee.com/qiuwenwu91/mm_api.git"
-  },
-  "dependencies": {
-    "mm_corejs": "^1.1.4",
-    "mm_machine": "^3.5.4",
-    "mm_param": "^1.1.0",
-    "mm_helper": "^1.0.0",
-    "mm_sql": "^1.8.0"
-  },
-  "scripts": {
-    "test": "node test.js && node --test tests/*.test.js"
-  }
+    "name": "mm_api",
+    "version": "1.1.3",
+    "description": "API框架，用于实现web api和mvc模式路由请求，负责配置路由路径、访问权限、校验机制；基于 mm_corejs，内置管理器池，无全局/原型扩展依赖",
+    "main": "index.js",
+    "keywords": [
+        "mm_mod",
+        "mm_port",
+        "mm_in_port",
+        "api",
+        "mvc",
+        "router",
+        "oauth",
+        "API管理器"
+    ],
+    "layer": "port",
+    "group": "web",
+    "author": "邱文武",
+    "license": "ISC",
+    "repository": {
+        "type": "git",
+        "url": "git+https://gitee.com/qiuwenwu91/mm_api.git"
+    },
+    "dependencies": {
+        "mm_corejs": "^1.1.4",
+        "mm_dao": "^1.8.2",
+        "mm_helper": "^1.0.0",
+        "mm_machine": "^3.5.4",
+        "mm_param": "^1.1.0",
+        "mm_ret": "^1.4.8",
+        "mm_sql": "^1.8.0"
+    },
+    "scripts": {
+        "test": "node test.js && node --test tests/*.test.js"
+    }
 }