mm_dao 1.8.0 → 1.8.1

package/example/index.js

@@ -0,0 +1,78 @@
+'use strict';
+
+/**
+ * mm_dao SQL 帮助模块示例
+ * 演示：获取 SQL 模板管理器、创建 Dao 驱动，并在内存中构建查询条件（无需连接数据库）。
+ * 注：管理器 add() 存在未定义 Drive 的缺陷，此处直接实例化 Dao 驱动演示核心 API。
+ * 运行：node example/index.js
+ */
+
+const { daoAdmin, Dao } = require('../index.js');
+
+/**
+ * 创建一个纯内存的模拟数据库（仅实现 SQL 模板拼接，不连接真实数据库）
+ * @returns {object} 模拟数据库实例
+ */
+function createMockDb() {
+  return {
+    config: { filter: {} },
+    size: 30,
+    page: 0,
+    /**
+     * 过滤参数（无操作）
+     */
+    filter() {},
+    /**
+     * 模板查询拼接
+     * @param {object} param 参数对象
+     * @param {object} sql_tpl 模板对象
+     * @returns {string} 拼接结果
+     */
+    tplQuery(param, sql_tpl) {
+      const segments = [];
+      for (const key in param) {
+        const seg = sql_tpl[key]
+          ? sql_tpl[key].replace(/\{0\}/g, param[key])
+          : '`' + key + "` = '" + param[key] + "'";
+        segments.push(seg);
+      }
+      return segments.join(' AND ');
+    }
+  };
+}
+
+/**
+ * 主函数
+ * @returns {Promise<void>} 无返回值
+ */
+async function main() {
+  // 1. 获取 SQL 管理器（同 scope 复用实例）
+  const manager = daoAdmin('demo', { title: '示例SQL管理器' });
+  const manager2 = daoAdmin('demo');
+  console.log('管理器实例复用:', manager === manager2);
+
+  // 2. 创建 Dao 驱动（模板化增删改查）
+  const dao = new Dao(
+    {
+      name: 'user',
+      title: '用户表',
+      table: 'user_account',
+      key: 'user_id',
+      query: { name: "`name` like '%{0}%'", uid: '`uid` = {0}' }
+    },
+    manager
+  );
+  console.log('驱动类型:', dao instanceof Dao);
+
+  // 3. 构建查询条件（纯内存，无需数据库连接）
+  const where = dao.toWhere(createMockDb(), { name: '张三', uid: 1 }, 'get');
+  console.log('生成的WHERE条件:', where);
+
+  // 4. 驱动配置模型
+  console.log('驱动模型名称:', dao.getModel().name);
+}
+
+main().catch((err) => {
+  console.error('示例执行失败:', err);
+  process.exit(1);
+});

package/index.js

@@ -1,5 +1,4 @@
-const { Sql } = require('mm_sql');
-const Drive = require('./lib/drive');
+const Dao = require('./lib/dao');
 const Manager = require('./lib/manager');
 const Admin = require('mm_corejs').Admin;
 
@@ -7,8 +6,7 @@ const admin = new Admin();
 admin.setClass(Manager);
 
 module.exports = {
-  Sql,
-  Drive,
+  Dao,
   Manager,
   admin,
   /**
@@ -17,10 +15,10 @@ module.exports = {
    * @param {object} [config] 配置参数
    * @returns {object} SQL 管理器实例
    */
-  sqlAdmin(scope, config) {
+  daoAdmin(scope, config) {
     if (!scope) {
       scope = 'os';
     }
-    return admin.get(scope, { name: scope, ...config });
+    return admin.get(scope, config);
   }
 };

package/lib/{drive.js → dao.js}

@@ -1,164 +1,14 @@
 const path = require('path');
-const Item = require('mm_corejs').Base;
+const Item = require('mm_machine').Mod;
 const { string, array, date, file } = require('mm_helper');
-
-/**
- * 是否以指定后缀结尾（替代 mm_expand 的 String.ends）
- * @param {string} str 源字符串
- * @param {string} suffix 后缀
- * @returns {boolean} 以后缀结尾返回true, 否则返回false
- */
-function _strEnds(str, suffix) {
-  return (str + '').endsWith(suffix);
-}
-
-/**
- * 合并值（替代 mm_expand 的 Array.clear/addList 深合并语义, 数组整体拷贝）
- * @param {*} current 当前值
- * @param {*} value 新值
- * @param {boolean} bl 是否补充模式
- * @returns {*} 合并后的值
- */
-function _mergeValue(current, value, bl) {
-  var type = typeof current;
-  var value_type = typeof value;
-  if (type !== value_type) {
-    if (type === 'number') {
-      var n = Number(value);
-      return isNaN(n) ? 0 : n;
-    } else if (type === 'boolean') {
-      return !(value === '0' || value === 'false' || value === 'False');
-    } else if (type === 'string') {
-      return value.toString();
-    }
-    return value;
-  } else if (type === 'object') {
-    if (Array.isArray(current) && Array.isArray(value)) {
-      return value.slice();
-    }
-    _push(current, value, bl);
-    return current;
-  }
-  return value;
-}
-
-/**
- * 将对象B合并进对象A（替代 mm_os 全局 push）
- * @param {object} obj_a 被添加的对象
- * @param {object} obj_b 用作添加的对象
- * @param {boolean} bl 为true时只补充obj_a中缺失的键
- * @returns {object} 对象A自身
- */
-function _push(obj_a, obj_b, bl) {
-  if (!obj_a || !obj_b) {
-    return obj_a;
-  }
-  if (bl) {
-    for (var k in obj_b) {
-      var value = obj_b[k];
-      if (obj_a[k] === undefined || obj_a[k] === null || value === null) {
-        obj_a[k] = value;
-      } else {
-        obj_a[k] = _mergeValue(obj_a[k], value, bl);
-      }
-    }
-  } else {
-    for (var n in obj_a) {
-      var val = obj_b[n];
-      if (val !== undefined && obj_a[n] !== null && val !== null) {
-        obj_a[n] = _mergeValue(obj_a[n], val, bl);
-      }
-    }
-  }
-  return obj_a;
-}
-
-/**
- * 生成JSON-RPC响应体（替代 mm_os 的 ret.body, 等价 mm_ret 默认 json-rpc 格式）
- * @param {*} result 返回的结果
- * @param {object} error 错误信息 {code, message}
- * @returns {object} 响应格式
- */
-function _retBody(result, error) {
-  var ret = {};
-  if (result) {
-    ret.result = result;
-  } else if (error) {
-    ret.error = {
-      code: error.code || 10000,
-      message: error.message || '错误'
-    };
-  } else {
-    ret.error = { code: 10000, message: '错误' };
-  }
-  return ret;
-}
-
-/**
- * 生成错误响应（替代 mm_os 的 ret.error）
- * @param {number} code 错误码
- * @param {string} message 错误信息
- * @returns {object} 错误响应格式
- */
-function _retError(code, message) {
-  return _retBody(null, { code, message });
-}
-
-/**
- * 生成列表响应（替代 mm_os 的 ret.list）
- * @param {Array} list 返回列表
- * @param {number} count 查询结果数
- * @returns {object} 列表响应格式
- */
-function _retList(list, count) {
-  var result = { list: list || [] };
-  if (count !== undefined) {
-    result.count = count;
-  }
-  return _retBody(result, null);
-}
-
-/**
- * 生成对象响应（替代 mm_os 的 ret.obj）
- * @param {object} obj 返回对象
- * @returns {object} 对象响应格式
- */
-function _retObj(obj) {
-  return _retBody({ obj: obj }, null);
-}
-
-/**
- * 生成布尔型响应（替代 mm_os 的 ret.bl）
- * @param {boolean} bl 布尔结果
- * @param {string} tip 提示信息
- * @returns {object} 布尔响应格式
- */
-function _retBl(bl, tip) {
-  return _retBody({ bl: bl, tip: tip || (bl ? '成功' : '错误') }, null);
-}
-
-/**
- * 校验SQL标识符安全性, 仅允许字母、数字和下划线
- * @param {string} name 标识符名称
- * @returns {string} 安全的标识符
- */
-function validateIden(name) {
-  if (typeof name !== 'string' || !name) {
-    return '';
-  }
-  var sanitized = name.replace(/`/g, '');
-  if (!/^[a-zA-Z0-9_]+$/.test(sanitized)) {
-    return '';
-  }
-  return sanitized;
-}
+const { getRet } = require('mm_ret');
 
 /**
  * Sql操作驱动类
  * @augments {Item}
  * @class
  */
-class Drive extends Item {
+class Dao extends Item {
   static config = {
     main: '',
     // 表名 {0} 代表可前端传参自定义查询的表
@@ -283,7 +133,7 @@ class Drive extends Item {
    * @class
    */
   constructor(config, parent) {
-    super({ ...Drive.config, ...config });
+    super({ ...Dao.config, ...config });
 
     // 父级管理器引用（用于默认配置回退与插件查找）
     this.parent = parent || null;
@@ -296,7 +146,7 @@ class Drive extends Item {
 /**
  * 预设
  */
-Drive.prototype._preset = function () {
+Dao.prototype._preset = function () {
   // 保存文件目录
   this.save_dir = './static/file/';
   // 读取文件目录
@@ -311,7 +161,7 @@ Drive.prototype._preset = function () {
  * @returns {*} 配置值, 未配置返回 undefined
  * @private
  */
-Drive.prototype._getInject = function (key) {
+Dao.prototype._getInject = function (key) {
   var value = this.config[key];
   if (value !== undefined && value !== null && value !== '') {
     return value;
@@ -327,7 +177,7 @@ Drive.prototype._getInject = function (key) {
  * @returns {object} 字典对象
  * @private
  */
-Drive.prototype._getDict = function () {
+Dao.prototype._getDict = function () {
   return this._getInject('dict') || {};
 };
 
@@ -337,7 +187,7 @@ Drive.prototype._getDict = function () {
  * @param {object} db 数据库管理器
  * @returns {object} 过滤后的参数
  */
-Drive.prototype.before = async function (params, db) {
+Dao.prototype.before = async function (params, db) {
   return params;
 };
 
@@ -347,7 +197,7 @@ Drive.prototype.before = async function (params, db) {
  * @param {object} db 数据管理器
  * @returns {boolean} 验证通过返回true, 失败返回false
  */
-Drive.prototype.check = async function (params, db) {
+Dao.prototype.check = async function (params, db) {
   return true;
 };
 
@@ -357,7 +207,7 @@ Drive.prototype.check = async function (params, db) {
  * @param {object} db 数据管理器
  * @returns {object} 最终执行结果
  */
-Drive.prototype.after = async function (params, db) {
+Dao.prototype.after = async function (params, db) {
   return db.ret;
 };
 
@@ -366,7 +216,7 @@ Drive.prototype.after = async function (params, db) {
  * @param {string} table 表名
  * @param {object} sql 缓存sql语句
  */
-Drive.prototype.updateCache = async function (table, sql) {};
+Dao.prototype.updateCache = async function (table, sql) {};
 
 /**
  * @ 执行修改
@@ -375,7 +225,7 @@ Drive.prototype.updateCache = async function (table, sql) {};
  * @param {object} db 数据库管理器
  * @returns {object} 返回执行结果
  */
-Drive.prototype.run = async function (query, body, db) {
+Dao.prototype.run = async function (query, body, db) {
   var params = {
     query,
     body,
@@ -400,10 +250,10 @@ Drive.prototype.run = async function (query, body, db) {
  * @param {object} body 修改项
  * @returns {object} 返回准备参数
  */
-Drive.prototype.ready = function (db, query, body) {
+Dao.prototype.ready = function (db, query, body) {
   var cg = this.config;
   var qy = { ...query };
-  _push(db.config.filter, cg.filter, true);
+  Object.assign(db.config.filter, cg.filter);
   db.filter(qy);
   return {
     cg,
@@ -418,7 +268,7 @@ Drive.prototype.ready = function (db, query, body) {
  * @param {object} method 方法
  * @returns {string} 返回查询条件
  */
-Drive.prototype.toWhere = function (db, query, method) {
+Dao.prototype.toWhere = function (db, query, method) {
   var { cg, qy: originalQy } = this.ready(db, query, {});
   // 创建 qy 对象的副本，避免修改原始参数
   var qy = { ...originalQy };
@@ -435,7 +285,7 @@ Drive.prototype.toWhere = function (db, query, method) {
  * @param {object} query 查询条件
  * @private
  */
-Drive.prototype._setDbConfig = function (db, cg, query) {
+Dao.prototype._setDbConfig = function (db, cg, query) {
   db.config.separator = cg.separator;
   if (!query.size && cg.page_size) {
     db.size = cg.page_size + 0;
@@ -455,12 +305,12 @@ Drive.prototype._setDbConfig = function (db, cg, query) {
  * @returns {object} 更新后的查询条件对象
  * @private
  */
-Drive.prototype._setQueryField = function (db, query, cg, method, qy) {
+Dao.prototype._setQueryField = function (db, query, cg, method, qy) {
   var f = db.config.filter;
   var field = query[f.field];
   if (string.has(cg.field, '*{0}*')) {
     if (field) {
-      var safe_field = validateIden(field);
+      var safe_field = typeof field === 'string' && string.validate(field, 'username') ? field : '';
       if (safe_field) {
         db.field = cg.field.replace('{0}', safe_field);
       } else {
@@ -489,12 +339,12 @@ Drive.prototype._setQueryField = function (db, query, cg, method, qy) {
  * @returns {object} 更新后的查询条件对象
  * @private
  */
-Drive.prototype._setOrderBy = function (db, query, cg, qy) {
+Dao.prototype._setOrderBy = function (db, query, cg, qy) {
   var f = db.config.filter;
   var orderby = query[f.orderby];
   if (string.has(cg.orderby, '*{0}*')) {
     if (orderby) {
-      var safe_orderby = validateIden(orderby);
+      var safe_orderby = typeof orderby === 'string' && string.validate(orderby, 'username') ? orderby : '';
       if (safe_orderby) {
         db.orderby = cg.orderby.replace('{0}', safe_orderby);
       } else {
@@ -520,7 +370,7 @@ Drive.prototype._setOrderBy = function (db, query, cg, qy) {
  * @returns {string} 查询字符串
  * @private
  */
-Drive.prototype._buildQueryString = function (db, qy, cg) {
+Dao.prototype._buildQueryString = function (db, qy, cg) {
   var query_str = db.tplQuery(qy, cg.query);
   var qt = cg.query_default;
   if (Object.keys(qt).length > 0) {
@@ -550,21 +400,21 @@ Drive.prototype._buildQueryString = function (db, qy, cg) {
  * @param {object} method 方法
  * @returns {object} 返回查询结果
  */
-Drive.prototype.getMain = async function (db, query, method) {
+Dao.prototype.getMain = async function (db, query, method) {
   var ret;
   if (string.has(this.config.field, '*{0}*')) {
     var field = query[db.config.filter.field];
     if (field && array.getMatch(this.config.field_hide, field)) {
-      return _retError(70003, '不合法的查询参数');
+      return getRet().error(70003, '不合法的查询参数');
     }
   }
   var query_str = this.toWhere(db, query, method);
 
   // 查询
   if (db.count_ret === 'true') {
-    ret = _retBody(await db.getCountSql(query_str, db.orderby, db.field), null);
+    ret = getRet().body(await db.getCountSql(query_str, db.orderby, db.field), null);
   } else {
-    ret = _retList(await db.getSql(query_str, db.orderby, db.field));
+    ret = getRet().list(await db.getSql(query_str, db.orderby, db.field));
   }
   return ret;
 };
@@ -576,7 +426,7 @@ Drive.prototype.getMain = async function (db, query, method) {
  * @param {object} body 修改项
  * @returns {object} 返回查询结果
  */
-Drive.prototype.get = async function (db, query, body) {
+Dao.prototype.get = async function (db, query, body) {
   return await this.getMain(db, query);
 };
 
@@ -587,7 +437,7 @@ Drive.prototype.get = async function (db, query, body) {
  * @param {object} body 修改项
  * @returns {object} 返回查询结果
  */
-Drive.prototype.getObj = async function (db, query, body) {
+Dao.prototype.getObj = async function (db, query, body) {
   var qy = { ...query };
   qy.page = 1;
   qy.size = 1;
@@ -595,9 +445,9 @@ Drive.prototype.getObj = async function (db, query, body) {
   if (ret.result) {
     var list = ret.result.list;
     if (list.length > 0) {
-      return _retObj(list[0]);
+      return getRet().body({ obj: list[0] });
     } else {
-      return _retObj(null);
+      return getRet().body({ obj: null });
     }
   }
   return ret;
@@ -610,7 +460,7 @@ Drive.prototype.getObj = async function (db, query, body) {
  * @param {object} body 修改项
  * @returns {object} 返回修改结果
  */
-Drive.prototype.setMain = async function (db, query, body) {
+Dao.prototype.setMain = async function (db, query, body) {
   var ret;
   var { cg, qy } = this.ready(db, query, body);
   var key = cg.key;
@@ -640,9 +490,9 @@ Drive.prototype.setMain = async function (db, query, body) {
   var n = await db.setSql(query_str, db.tplBody(body, cg.update));
 
   if (n < 1) {
-    ret = _retError(500, '修改失败！\n' + db.error.message);
+    ret = getRet().error(500, '修改失败！\n' + db.error.message);
   } else {
-    ret = _retBl(true, '修改成功！');
+    ret = getRet().bl(true, '修改成功！');
   }
   return ret;
 };
@@ -654,7 +504,7 @@ Drive.prototype.setMain = async function (db, query, body) {
  * @param {object} body 修改项
  * @returns {object} 返回查询结果
  */
-Drive.prototype.set = async function (db, query, body) {
+Dao.prototype.set = async function (db, query, body) {
   return await this.setMain(db, query, body);
 };
 
@@ -664,7 +514,7 @@ Drive.prototype.set = async function (db, query, body) {
  * @param {object} body 添加项
  * @returns {object} 返回查询结果
  */
-Drive.prototype.addMain = async function (db, body) {
+Dao.prototype.addMain = async function (db, body) {
   var ret;
   var cg = this.config;
   if (Object.keys(body).length > 0) {
@@ -687,12 +537,12 @@ Drive.prototype.addMain = async function (db, body) {
     }
     var n = await db.add(body);
     if (n < 1) {
-      ret = _retError(500, '添加失败！\n' + db.error.message);
+      ret = getRet().error(500, '添加失败！\n' + db.error.message);
     } else {
-      ret = _retBl(true, '添加成功！');
+      ret = getRet().bl(true, '添加成功！');
     }
   } else {
-    ret = _retError(30001, '参数不能为空');
+    ret = getRet().error(30001, '参数不能为空');
   }
   if (cg.log) {
     this.log('debug', '添加SQL语句', db.sql);
@@ -707,7 +557,7 @@ Drive.prototype.addMain = async function (db, body) {
  * @param {object} body 修改项
  * @returns {object} 返回添加结果
  */
-Drive.prototype.add = async function (db, query, body) {
+Dao.prototype.add = async function (db, query, body) {
   return await this.addMain(db, body);
 };
 
@@ -717,9 +567,9 @@ Drive.prototype.add = async function (db, query, body) {
  * @param {Array} list 添加项列表
  * @returns {object} 返回批量添加结果
  */
-Drive.prototype.addListMain = async function (db, list) {
+Dao.prototype.addListMain = async function (db, list) {
   if (!Array.isArray(list) || list.length === 0) {
-    return _retError(30001, '参数不能为空');
+    return getRet().error(30001, '参数不能为空');
   }
   var success_num = 0;
   var error_num = 0;
@@ -735,7 +585,7 @@ Drive.prototype.addListMain = async function (db, list) {
       success_num++;
     }
   }
-  var done = _retBl(success_num > 0, success_num > 0 ? '批量添加成功！' : '批量添加失败！');
+  var done = getRet().bl(success_num > 0, success_num > 0 ? '批量添加成功！' : '批量添加失败！');
   Object.assign(done.result, {
     total: list.length,
     success: success_num,
@@ -752,7 +602,7 @@ Drive.prototype.addListMain = async function (db, list) {
  * @param {Array} list 添加项列表
  * @returns {object} 返回批量添加结果
  */
-Drive.prototype.addList = async function (db, list) {
+Dao.prototype.addList = async function (db, list) {
   return await this.addListMain(db, list);
 };
 
@@ -762,15 +612,15 @@ Drive.prototype.addList = async function (db, list) {
  * @param {object} query 查询条件
  * @returns {object} 返回查询结果
  */
-Drive.prototype.delMain = async function (db, query) {
+Dao.prototype.delMain = async function (db, query) {
   var ret;
   var { cg, qy } = this.ready(db, query, {});
   var query_str = db.tplQuery(qy, cg.query);
   var bl = await db.delSql(query_str);
   if (bl < 1) {
-    ret = _retError(500, '删除失败！\n' + db.error.message);
+    ret = getRet().error(500, '删除失败！\n' + db.error.message);
   } else {
-    ret = _retBl(true, '删除成功！');
+    ret = getRet().bl(true, '删除成功！');
   }
   if (cg.log) {
     this.log('debug', '删除SQL语句', db.sql);
@@ -785,7 +635,7 @@ Drive.prototype.delMain = async function (db, query) {
  * @param {object} body 修改项
  * @returns {object} 返回删除结果
  */
-Drive.prototype.del = async function (db, query, body = {}) {
+Dao.prototype.del = async function (db, query, body = {}) {
   return await this.delMain(db, { ...query, ...body });
 };
 
@@ -796,18 +646,18 @@ Drive.prototype.del = async function (db, query, body = {}) {
  * @param {object} body 修改项
  * @returns {object} 返回修改结果
  */
-Drive.prototype.addorsetMain = async function (db, query, body) {
+Dao.prototype.addorsetMain = async function (db, query, body) {
   var ret;
   var { cg, qy } = this.ready(db, query, body);
   if (Object.keys(body).length > 0 && Object.keys(qy).length > 0) {
     var n = await db.addOrSet(qy, body);
     if (n < 1) {
-      ret = _retError(500, '操作失败！\n' + db.error.message);
+      ret = getRet().error(500, '操作失败！\n' + db.error.message);
     } else {
-      ret = _retBl(true, '操作成功！');
+      ret = getRet().bl(true, '操作成功！');
     }
   } else {
-    ret = _retError(30001, '参数不能为空');
+    ret = getRet().error(30001, '参数不能为空');
   }
   if (cg.log) {
     this.log('debug', '添加或修改SQL语句', db.sql);
@@ -822,7 +672,7 @@ Drive.prototype.addorsetMain = async function (db, query, body) {
  * @param {object} body 修改项
  * @returns {object} 返回查询结果
  */
-Drive.prototype.addOrSet = async function (db, query, body) {
+Dao.prototype.addOrSet = async function (db, query, body) {
   return await this.addOrSetMain(db, query, body);
 };
 
@@ -831,7 +681,7 @@ Drive.prototype.addOrSet = async function (db, query, body) {
  * @param {string} data_type 数据类型
  * @returns {string} 返回数据类型
  */
-Drive.prototype.getType = function (data_type) {
+Dao.prototype.getType = function (data_type) {
   if (data_type.indexOf('int') !== -1) {
     return 'number';
   } else {
@@ -845,7 +695,7 @@ Drive.prototype.getType = function (data_type) {
  * @param {string} field 要获取的字段
  * @returns {Array} 返回参数信息列表
  */
-Drive.prototype.getParam = async function (db, field) {
+Dao.prototype.getParam = async function (db, field) {
   var cg = this.config;
   if (cg.params) {
     return cg.params;
@@ -866,7 +716,7 @@ Drive.prototype.getParam = async function (db, field) {
  * @returns {Array} 字段列表
  * @private
  */
-Drive.prototype._getFieldsFromCache = function (cg) {
+Dao.prototype._getFieldsFromCache = function (cg) {
   var lt = [];
   // 方案B：db 池改为可选注入（config.get_db_pool 返回等价数据库池注册表），未配置则跳过缓存读取
   var get_db_pool = this._getInject('get_db_pool');
@@ -896,7 +746,7 @@ Drive.prototype._getFieldsFromCache = function (cg) {
  * @returns {Array} 字段列表
  * @private
  */
-Drive.prototype._getFieldsFromDb = async function (db, cg) {
+Dao.prototype._getFieldsFromDb = async function (db, cg) {
   var lt = [];
   db.table = cg.table;
   var list = await db.fields();
@@ -921,7 +771,7 @@ Drive.prototype._getFieldsFromDb = async function (db, cg) {
  * @returns {Array} 过滤后的字段列表
  * @private
  */
-Drive.prototype._filterFields = function (lt, field, cg) {
+Dao.prototype._filterFields = function (lt, field, cg) {
   var fields = field || cg.field_default;
   if (fields && fields !== '*') {
     var arr = fields.replace(/`/g, '').split(',');
@@ -935,7 +785,7 @@ Drive.prototype._filterFields = function (lt, field, cg) {
  * @param {object} db 数据库操作类
  * @returns {Array} 格式列表
  */
-Drive.prototype.getFormat = async function (db) {
+Dao.prototype.getFormat = async function (db) {
   var dbs = { ...db };
   dbs.size = 0;
   var fmt = this.config.format;
@@ -966,16 +816,16 @@ Drive.prototype.getFormat = async function (db) {
  * @param {string} filename 文件名
  * @returns {object} 返回导入结果
  */
-Drive.prototype.importMain = async function (db, filename) {
+Dao.prototype.importMain = async function (db, filename) {
   var params = await this.getParam(db);
   var format = await this.getFormat(db);
   var file = this._processFilePath(filename);
   if (!file.hasFile(file)) {
-    return _retError(30001, file + '文件不存在！');
+    return getRet().error(30001, file + '文件不存在！');
   }
   var jarr = await this._loadImport(file, params, format);
   if (!jarr || !jarr.length) {
-    return _retError(10000, '要导入的数据不能为空!');
+    return getRet().error(10000, '要导入的数据不能为空!');
   }
   var result = await this._importToDb(db, jarr);
   return this._buildImport(result);
@@ -987,7 +837,7 @@ Drive.prototype.importMain = async function (db, filename) {
  * @returns {string} 处理后的文件路径
  * @private
  */
-Drive.prototype._processFilePath = function (filename) {
+Dao.prototype._processFilePath = function (filename) {
   var file = filename;
   var run_path = this._getInject('run_path') || '';
   if (file.indexOf(run_path) !== 0) {
@@ -1006,10 +856,10 @@ Drive.prototype._processFilePath = function (filename) {
  * @returns {Array} 数据数组
  * @private
  */
-Drive.prototype._loadImport = async function (file, params, format) {
-  if (_strEnds(file, '.json')) {
+Dao.prototype._loadImport = async function (file, params, format) {
+  if (file.endsWith('.json')) {
     return file.loadJson(file);
-  } else if (_strEnds(file, '.xml')) {
+  } else if (file.endsWith('.xml')) {
     return file.loadXml(file);
   } else {
     const Excel = require('mm_excel');
@@ -1033,7 +883,7 @@ Drive.prototype._loadImport = async function (file, params, format) {
  * @returns {object} 导入结果
  * @private
  */
-Drive.prototype._importToDb = async function (db, jarr) {
+Dao.prototype._importToDb = async function (db, jarr) {
   var list = [];
   var errors = [];
   var list_error = [];
@@ -1073,9 +923,9 @@ Drive.prototype._importToDb = async function (db, jarr) {
  * @returns {object} 返回结果对象
  * @private
  */
-Drive.prototype._buildImport = function (result) {
+Dao.prototype._buildImport = function (result) {
   var bl = result.list.length === result.total;
-  var body = _retBl(bl, bl ? '导入成功!' : '导入失败!');
+  var body = getRet().bl(bl, bl ? '导入成功!' : '导入失败!');
   body.result.list = result.list;
   if (result.errors.length) {
     body.result.list_error = result.list_error;
@@ -1091,10 +941,10 @@ Drive.prototype._buildImport = function (result) {
  * @param {object} body 导入设置
  * @returns {object} 返回执行结果
  */
-Drive.prototype.import = async function (db, query, body) {
+Dao.prototype.import = async function (db, query, body) {
   var params = { ...query, ...body };
   if (!params.file) {
-    return _retError(60000, '文件名（file）参数不能为空');
+    return getRet().error(60000, '文件名（file）参数不能为空');
   }
   return await this.importMain(db, params.file);
 };
@@ -1109,10 +959,10 @@ Drive.prototype.import = async function (db, query, body) {
  * @property {string} body.path 文件路径 例如: /static/download, 可不填写
  * @returns {object} 返回执行结果
  */
-Drive.prototype.exportMain = async function (db, query, body) {
+Dao.prototype.exportMain = async function (db, query, body) {
   var by = await this.getMain(db, query);
   if (db.error) {
-    return _retError(10000, db.error.message);
+    return getRet().error(10000, db.error.message);
   }
   var config = this._prepareExportConfig(query, body);
   var params = await this.getParam(db, config.fields);
@@ -1133,7 +983,7 @@ Drive.prototype.exportMain = async function (db, query, body) {
  * @returns {object} 导出配置
  * @private
  */
-Drive.prototype._prepareExportConfig = function (query, body) {
+Dao.prototype._prepareExportConfig = function (query, body) {
   var path = body.path;
   var file = body.file;
   var fields = body.fields;
@@ -1158,7 +1008,7 @@ Drive.prototype._prepareExportConfig = function (query, body) {
  * @returns {string} 导出路径
  * @private
  */
-Drive.prototype._getPath = function () {
+Dao.prototype._getPath = function () {
   return (
     this._getInject('user_path') ||
     this._getInject('static_path') ||
@@ -1175,7 +1025,7 @@ Drive.prototype._getPath = function () {
  * @returns {string} 保存后的文件路径
  * @private
  */
-Drive.prototype._saveExportFile = async function (file, params, format, list) {
+Dao.prototype._saveExportFile = async function (file, params, format, list) {
   var export_path = this._getPath();
   var save_file = file.fullname(file, export_path);
   file.addDir(save_file);
@@ -1199,8 +1049,8 @@ Drive.prototype._saveExportFile = async function (file, params, format, list) {
  * @returns {object} 导出结果
  * @private
  */
-Drive.prototype._buildExport = function (file, name) {
-  var body = _retBl(!!file, file ? '导出成功!' : '导出失败!');
+Dao.prototype._buildExport = function (file, name) {
+  var body = getRet().bl(!!file, file ? '导出成功!' : '导出失败!');
   body.result.file = file;
   body.result.url = this.url_path + name;
   return body;
@@ -1213,7 +1063,7 @@ Drive.prototype._buildExport = function (file, name) {
  * @param {object} body 修改项
  * @returns {object} 返回执行结果
  */
-Drive.prototype.export = async function (db, query, body) {
+Dao.prototype.export = async function (db, query, body) {
   return await this.exportMain(db, query, body);
 };
 
@@ -1223,18 +1073,23 @@ Drive.prototype.export = async function (db, query, body) {
  * @param {object} params 查询参数
  * @returns {object} 返回执行结果
  */
-Drive.prototype.delRepeatMain = async function (db, params) {
+Dao.prototype.delRepeatMain = async function (db, params) {
   var pm = { ...params };
   var msg = '';
   var cg = this.config.del_repeat;
   var order_by = pm.orderby || cg.orderby;
   delete pm.orderby;
+  var group_by_val = pm.groupby || cg.groupby;
   var group_by =
-    validateIden(pm.groupby || cg.groupby) || cg.groupby || '';
+    (typeof group_by_val === 'string' && string.validate(group_by_val, 'username') ? group_by_val : '') ||
+    cg.groupby ||
+    '';
   delete pm.groupby;
   var f = db.config.filter;
   // 设置查询字段
-  var field = validateIden(pm[f.field]) || group_by;
+  var field =
+    (typeof pm[f.field] === 'string' && string.validate(pm[f.field], 'username') ? pm[f.field] : '') ||
+    group_by;
   delete pm[f.field];
   db.field = field;
   var sql = db
@@ -1261,7 +1116,7 @@ Drive.prototype.delRepeatMain = async function (db, params) {
   } else {
     msg = '没有重复项。';
   }
-  return _retBl(!msg, msg ? '去重失败!原因：' + msg : '去重成功!');
+  return getRet().bl(!msg, msg ? '去重失败!原因：' + msg : '去重成功!');
 };
 
 /**
@@ -1271,7 +1126,7 @@ Drive.prototype.delRepeatMain = async function (db, params) {
  * @param {object} body 正文参数
  * @returns {object} 返回执行结果
  */
-Drive.prototype.delRepeat = async function (db, query, body) {
+Dao.prototype.delRepeat = async function (db, query, body) {
   var pm = { ...query, ...body };
   return await this.delRepeatMain(db, pm);
 };
@@ -1282,7 +1137,7 @@ Drive.prototype.delRepeat = async function (db, query, body) {
  * @param {object} db 数据管理器
  * @returns {object} 返回执行结果
  */
-Drive.prototype.main = async function (params, db) {
+Dao.prototype.main = async function (params, db) {
   var { query, body } = params;
 
   var cg = this.config;
@@ -1292,7 +1147,7 @@ Drive.prototype.main = async function (params, db) {
     method = 'get';
   }
   if (!string.has(cg.method, '*' + method + '*')) {
-    return _retError(50001, '不支持的操作方式');
+    return getRet().error(50001, '不支持的操作方式');
   }
   method = this._getMethodName(method);
   var qy = { ...query };
@@ -1303,17 +1158,17 @@ Drive.prototype.main = async function (params, db) {
     // 过滤查询参数
     var f = cg.filter;
     var table = query[f.table];
-    var safe_table = validateIden(table);
+    var safe_table = typeof table === 'string' && string.validate(table, 'username') ? table : '';
 
     // 设置操作的数据表
     if (string.has(cg.table, '*{0}*')) {
       if (table) {
         if (!safe_table) {
-          return _retError(30001, '表名包含无效字符');
+          return getRet().error(30001, '表名包含无效字符');
         }
         db.table = cg.table.replace('{0}', safe_table);
       } else {
-        return _retError(30001, '表名不能为空');
+        return getRet().error(30001, '表名不能为空');
       }
     } else {
       db.table = cg.table + '';
@@ -1321,7 +1176,7 @@ Drive.prototype.main = async function (params, db) {
 
     return await this[method](db, qy, { ...body });
   } else {
-    return _retError(50001, '不支持的操作方式');
+    return getRet().error(50001, '不支持的操作方式');
   }
 };
 
@@ -1331,7 +1186,7 @@ Drive.prototype.main = async function (params, db) {
  * @returns {string} 方法名
  * @private
  */
-Drive.prototype._getMethodName = function (method) {
+Dao.prototype._getMethodName = function (method) {
   if (!method) {
     return '';
   }
@@ -1354,7 +1209,7 @@ Drive.prototype._getMethodName = function (method) {
  * @param {object} param 查询条件
  * @returns {object} 返回执行结果
  */
-Drive.prototype.sumMain = async function (db, param) {
+Dao.prototype.sumMain = async function (db, param) {
   var pm = { ...param };
   var ret;
   var orderby = pm.orderby || '';
@@ -1367,13 +1222,13 @@ Drive.prototype.sumMain = async function (db, param) {
   var query_str = this.toWhere(db, pm, 'get_list');
 
   if (!groupby || !field) {
-    ret = _retError(30000, '参数groupby、field是必须的，且值不能为空！');
+    ret = getRet().error(30000, '参数groupby、field是必须的，且值不能为空！');
   } else {
     var list = await db.groupSumSql(query_str, groupby, field, orderby);
     if (!list.length && db.error) {
-      ret = _retBody(db.error);
+      ret = getRet().body(db.error);
     } else {
-      ret = _retList(list);
+      ret = getRet().list(list);
     }
   }
   return ret;
@@ -1386,7 +1241,7 @@ Drive.prototype.sumMain = async function (db, param) {
  * @param {object} body 正文参数
  * @returns {object} 返回执行结果
  */
-Drive.prototype.sum = async function (db, query, body) {
+Dao.prototype.sum = async function (db, query, body) {
   var pm = { ...query, ...body };
   return await this.sumMain(db, pm);
 };
@@ -1397,7 +1252,7 @@ Drive.prototype.sum = async function (db, query, body) {
  * @param {object} param 查询条件
  * @returns {object} 返回执行结果
  */
-Drive.prototype.avgMain = async function (db, param) {
+Dao.prototype.avgMain = async function (db, param) {
   var pm = { ...param };
   var ret;
   var orderby = pm.orderby || '';
@@ -1410,13 +1265,13 @@ Drive.prototype.avgMain = async function (db, param) {
   var query_str = this.toWhere(db, pm, 'get_list');
 
   if (!groupby || !field) {
-    ret = _retError(30000, '参数groupby、field是必须的，且值不能为空！');
+    ret = getRet().error(30000, '参数groupby、field是必须的，且值不能为空！');
   } else {
     var list = await db.groupAvgSql(query_str, groupby, field, orderby);
     if (!list.length && db.error) {
-      ret = _retBody(db.error);
+      ret = getRet().body(db.error);
     } else {
-      ret = _retList(list);
+      ret = getRet().list(list);
     }
   }
   return ret;
@@ -1429,7 +1284,7 @@ Drive.prototype.avgMain = async function (db, param) {
  * @param {object} body 正文参数
  * @returns {object} 返回执行结果
  */
-Drive.prototype.avg = async function (db, query, body) {
+Dao.prototype.avg = async function (db, query, body) {
   var pm = { ...query, ...body };
   return await this.avgMain(db, pm);
 };
@@ -1440,7 +1295,7 @@ Drive.prototype.avg = async function (db, query, body) {
  * @param {object} param 查询条件
  * @returns {object} 返回执行结果
  */
-Drive.prototype.countMain = async function (db, param) {
+Dao.prototype.countMain = async function (db, param) {
   var pm = { ...param };
   var ret;
   var orderby = pm.orderby || '';
@@ -1453,13 +1308,13 @@ Drive.prototype.countMain = async function (db, param) {
   var query_str = this.toWhere(db, pm, 'get_list');
 
   if (!groupby || !field) {
-    ret = _retError(30000, '参数groupby、field是必须的，且值不能为空！');
+    ret = getRet().error(30000, '参数groupby、field是必须的，且值不能为空！');
   } else {
     var list = await db.groupCountSql(query_str, groupby, field, orderby);
     if (!list.length && db.error) {
-      ret = _retBody(db.error);
+      ret = getRet().body(db.error);
     } else {
-      ret = _retList(list);
+      ret = getRet().list(list);
     }
   }
   return ret;
@@ -1472,7 +1327,7 @@ Drive.prototype.countMain = async function (db, param) {
  * @param {object} body 正文参数
  * @returns {object} 返回执行结果
  */
-Drive.prototype.count = async function (db, query, body) {
+Dao.prototype.count = async function (db, query, body) {
   var pm = { ...query, ...body };
   return await this.countMain(db, pm);
 };
@@ -1482,7 +1337,7 @@ Drive.prototype.count = async function (db, query, body) {
  * @param {string} type 模型类型
  * @returns {object} 返回获取到的模型
  */
-Drive.prototype.getModel = function (type) {
+Dao.prototype.getModel = function (type) {
   let model = { ...this.config };
   let dir = this.config.dir || '';
   let l = path.sep;
@@ -1494,4 +1349,4 @@ Drive.prototype.getModel = function (type) {
   model.name = model.name || app_name + '_' + name;
   return model;
 };
-module.exports = Drive;
+module.exports = Dao;

package/lib/manager.js

@@ -1,7 +1,7 @@
 const path = require("path");
-const Manager = require("mm_corejs").Manager;
-const Drive = require("./drive");
-const { Sql } = require("mm_sql");
+const Manager = require('mm_machine').Manager;
+const Dao = require("./dao");
+const { getSql } = require("mm_sql");
 const { array } = require("mm_helper");
 
 /**
@@ -9,7 +9,7 @@ const { array } = require("mm_helper");
  * @augments {Manager}
  * @class
  */
-class SqlManager extends Manager {
+class DaoManager extends Manager {
   /**
    * 配置参数
    * @type {object}
@@ -67,11 +67,9 @@ class SqlManager extends Manager {
    * @param {object} parent 父级模块
    */
   constructor(config, parent) {
-    super({ ...SqlManager.config, ...config }, parent);
-    // 插件注册表（方案B：手动注册，替代原全局插件池）
-    this.plugins = {};
+    super({ ...DaoManager.config, ...config }, parent);
     // 兼容 Sql 实例（惰性创建，供 db()/load() 等价入口委托）
-    this._sql = null;
+    this._sql = getSql();
   }
 }
 
@@ -79,15 +77,42 @@ class SqlManager extends Manager {
  * sql驱动类
  * @type {Drive}
  */
-SqlManager.prototype.Drive = Drive;
+DaoManager.prototype.Drive = Dao;
+
+/**
+ * 初始化桥接（生命周期汇聚点：init() 与 do('init') 均调用，触发 onInit）
+ * @returns {Promise<void>} 初始化完成
+ * @private
+ */
+DaoManager.prototype._init = async function () {
+  await this.onInit();
+};
+
+/**
+ * 启动桥接（生命周期汇聚点，触发 onStart）
+ * @returns {Promise<void>} 启动完成
+ * @private
+ */
+DaoManager.prototype._start = async function () {
+  await this.onStart();
+};
+
+/**
+ * 停止桥接（生命周期汇聚点，触发 onStop）
+ * @returns {Promise<void>} 停止完成
+ * @private
+ */
+DaoManager.prototype._stop = async function () {
+  await this.onStop();
+};
 
 /**
  * 注册一个 sql 驱动（方案B：手动注册，不扫描目录）
  * @param {object} config 驱动配置（必须包含 name）
  * @returns {object} 驱动实例
  */
-SqlManager.prototype.add = function (config) {
-  var drive = new Drive(
+DaoManager.prototype.add = function (config) {
+  var drive = new this.Drive(
     {
       dict: this.config.dict,
       get_db_pool: this.config.get_db_pool,
@@ -107,7 +132,7 @@ SqlManager.prototype.add = function (config) {
  * @param {string} name 驱动名称
  * @returns {Promise<boolean>} 是否删除成功
  */
-SqlManager.prototype.del = async function (name) {
+DaoManager.prototype.del = async function (name) {
   var drive = this.get(name);
   if (drive) {
     await drive.stop();
@@ -121,7 +146,7 @@ SqlManager.prototype.del = async function (name) {
  * @param {string} name 驱动名称
  * @returns {Promise<boolean>} 是否执行成功
  */
-SqlManager.prototype.reload = async function (name) {
+DaoManager.prototype.reload = async function (name) {
   var drive = this.get(name);
   if (!drive) {
     this.log("warn", "驱动不存在，无法重启", name);
@@ -139,26 +164,13 @@ SqlManager.prototype.reload = async function (name) {
 };
 
 /**
- * 注册插件集合（供驱动 plugin() 查找，替代原全局插件池）
- * @param {string} name 插件作用域名称（app 名）
- * @param {object} obj 插件集合对象（需含 get 方法）
- * @returns {object} 当前管理器实例
- */
-SqlManager.prototype.usePlugin = function (name, obj) {
-  this.plugins[name] = obj;
-  return this;
-};
-
-/**
- * 初始化驱动实例（仅未初始化时执行生命周期 init，重复调用安全）
+ * 初始化驱动实例（执行生命周期 init）
  * @param {object} drive 驱动实例
  * @returns {Promise<void>} 初始化完成
  * @private
  */
-SqlManager.prototype._initDrive = async function (drive) {
-  if (drive.isState("created")) {
-    await drive.init();
-  }
+DaoManager.prototype._initDrive = async function (drive) {
+  await drive.init();
 };
 
 /**
@@ -166,7 +178,7 @@ SqlManager.prototype._initDrive = async function (drive) {
  * @returns {Array} 驱动配置数组
  * @private
  */
-SqlManager.prototype._getInfos = function () {
+DaoManager.prototype._getInfos = function () {
   return this.values().map((d) => d.config);
 };
 
@@ -174,8 +186,8 @@ SqlManager.prototype._getInfos = function () {
  * 排序（返回按名称升序的驱动配置列表）
  * @returns {Array} 排序后的配置列表
  */
-SqlManager.prototype.sort = function () {
-  var infos = this._getInfos();
+DaoManager.prototype.sort = function () {
+  var infos = this.configs;
   return array.sortBy(infos, "asc", "name");
 };
 
@@ -187,7 +199,7 @@ SqlManager.prototype.sort = function () {
  * @param {object} db 数据库管理器 (object) 只支持可用sql语句的数据库
  * @returns {object} 执行结果
  */
-SqlManager.prototype.run = async function (name, query, body, db) {
+DaoManager.prototype.run = async function (name, query, body, db) {
   var obj = this.get(name);
   if (obj) {
     return await obj.run(query, body, db);
@@ -200,7 +212,7 @@ SqlManager.prototype.run = async function (name, query, body, db) {
  * @returns {Sql} 兼容 Sql 实例
  * @private
  */
-SqlManager.prototype._getSql = function () {
+DaoManager.prototype._getSql = function () {
   if (!this._sql) {
     var SERVER = this.getServer();
     var server_config = (SERVER && SERVER.config) || {};
@@ -223,7 +235,7 @@ SqlManager.prototype._getSql = function () {
  * 获取数据库管理器（等价入口，委托内部 Sql 实例）
  * @returns {object} 数据库管理器实例
  */
-SqlManager.prototype.db = function () {
+DaoManager.prototype.db = function () {
   return this._getSql().db();
 };
 
@@ -232,8 +244,8 @@ SqlManager.prototype.db = function () {
  * @param {string} file SQL 文件路径
  * @returns {Promise<object>} 执行结果统计对象
  */
-SqlManager.prototype.load = function (file) {
+DaoManager.prototype.load = function (file) {
   return this._getSql().load(file);
 };
 
-module.exports = SqlManager;
+module.exports = DaoManager;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_dao",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "一个通用的SQL帮助类，支持通过切换db_type实现对不同数据库的操作，包括MySQL和SQLite等；另提供 manager.js/drive.js 的SQL模板管理器（融合自 mm_os com/sql，基于 mm_corejs，内置管理器池，无全局/原型扩展依赖）",
   "main": "index.js",
   "scripts": {
@@ -12,12 +12,12 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/qiuwenwu/mm_sql.git"
+    "url": "git+https://gitee.com/qiuwenwu91/mm_dao.git"
   },
   "keywords": [
     "mm_mod",
-    "mm_port",
-    "mm_repo",
+    "mm_infra",
+    "mm_runtime",
     "sql",
     "mysql",
     "sql server",
@@ -42,19 +42,18 @@
   "author": "邱文武",
   "license": "ISC",
   "bugs": {
-    "url": "https://github.com/qiuwenwu/mm_sql/issues"
+    "url": "https://gitee.com/qiuwenwu91/mm_dao/issues"
   },
-  "homepage": "https://github.com/qiuwenwu/mm_sql#readme",
+  "homepage": "https://gitee.com/qiuwenwu91/mm_dao#readme",
   "engines": {
     "node": ">=12.0.0"
   },
   "dependencies": {
-    "mm_jsondb": "^1.0.0",
-    "mm_mysql": "^2.5.6",
-    "mm_sqlite": "^1.5.5",
     "mm_corejs": "^1.1.4",
+    "mm_machine": "^3.5.4",
     "mm_helper": "^1.0.0",
     "mm_excel": "^1.2.4",
+    "mm_ret": "^1.4.8",
     "mm_sql": "^1.8.0"
   },
   "devDependencies": {