mm_sqlite 1.4.8 → 1.5.0

package/db.js

@@ -672,19 +672,6 @@ DB.prototype.renameTable = function (table, new_table, timeout = 15000) {
   return this.exec('ALTER TABLE `' + table + '` RENAME TO `' + new_table + '`;', [], timeout);
 };
 
-/**
- * @description 清空数据表（保留表结构）
- * @param {string} table 表名
- * @param {number} timeout - 超时时间(毫秒)
- * @returns {Promise | number} 清空成功返回1，失败返回0
- */
-DB.prototype.emptyTable = function (table, timeout = 15000) {
-  if (!table) {
-    throw new TypeError('table must be specified');
-  }
-  return this.exec('DELETE FROM `' + table + '`;', [], timeout);
-};
-
 /**
  * @description 检查表是否存在
  * @param {string} table 表名

package/index.js

@@ -1,4 +1,3 @@
-const sqlite3 = require('sqlite3').verbose();
 const {
   DB
 } = require('./db');
@@ -112,26 +111,24 @@ SQLite.prototype.open = async function (timeout) {
  * 关闭数据库连接（统一使用连接池模式）
  * @returns {Promise<boolean>}
  */
-SQLite.prototype.close = function () {
+SQLite.prototype.close = async function () {
   if (this._status !== 'connected') {
     this.log('warn', '数据库连接未建立');
-    return Promise.resolve(false);
-  }
-
-  return new Promise((resolve) => {
-    try {
-      // 统一关闭连接池
-      this._pool.close();
-      this._db = null;
-      this._open = false;
-      this._status = 'closed';
-      resolve(true);
-    } catch (err) {
-      this.log('error', '关闭数据库连接时发生异常', err);
-      this._status = 'closed';
-      resolve(false);
-    }
-  });
+    return false;
+  }
+
+  try {
+    // 统一关闭连接池
+    this._pool.close();
+    this._db = null;
+    this._open = false;
+    this._status = 'closed';
+    return true;
+  } catch (err) {
+    this.log('error', '关闭数据库连接时发生异常', err);
+    this._status = 'closed';
+    return false;
+  }
 };
 
 /**
@@ -184,40 +181,19 @@ SQLite.prototype.run = async function (sql, params = [], timeout = 30000) {
   try {
     // 获取连接
     conn = await this.getConn(query_timeout);
-    let timeout_id = null;
-
-    ret = await new Promise((resolve, reject) => {
-      // 设置超时定时器
-      timeout_id = setTimeout(() => {
-        reject(new Error(`SQL查询超时: ${timeout}ms`));
-      }, timeout);
-
-      // 执行SQL查询
-      conn.all(sql, params || [], (error, rows) => {
-        // 清除超时定时器
-        if (timeout_id) {
-          clearTimeout(timeout_id);
-          timeout_id = null;
-        }
-        if (error) {
-          reject(error);
-          resolve([]);
-        } else {
-          // 保持与MySQL兼容的返回值格式，始终返回数组
-          resolve(rows);
-        }
-      });
-    });
+
+    // better-sqlite3 同步查询，无需 Promise 包装
+    const stmt = conn.prepare(sql);
+    ret = params.length > 0 ? stmt.all(params) : stmt.all();
   } catch (error) {
     console.error('SQL执行失败', error);
     this.sql = sql;
     this.error = {
-      code: error.errno,
+      code: error.code || error.errno,
       message: error.message
     };
     ret = [];
-  }
-  finally {
+  } finally {
     await releaseConn(conn);
   }
   return ret;
@@ -231,7 +207,7 @@ SQLite.prototype.run = async function (sql, params = [], timeout = 30000) {
  * @returns {Promise<object>}
  * @throws {TypeError} 当sql参数无效时
  */
-SQLite.prototype.exec = async function (sql, params, timeout) {
+SQLite.prototype.exec = async function (sql, params = [], timeout) {
   // 参数校验
   if (typeof sql !== 'string' || sql.trim() === '') {
     throw new TypeError('sql must be non-empty string');
@@ -252,40 +228,28 @@ SQLite.prototype.exec = async function (sql, params, timeout) {
     // 获取连接
     conn = await this.getConn(timeout);
     this.sql = sql;
-    // 替换Promise.race为更可靠的超时控制
-    let timeout_id = null;
-    ret = await new Promise((resolve, reject) => {
-      // 设置超时定时器
-      timeout_id = setTimeout(() => {
-        reject(new Error(`SQL执行超时: ${timeout}ms`));
-      }, timeout);
-
-      // 执行SQL语句
-      conn.run(sql, params || [], function (error) {
-        // 清除超时定时器
-        if (timeout_id) {
-          clearTimeout(timeout_id);
-          timeout_id = null;
-        }
-        if (error) {
-          reject(error);
-        } else {
-          resolve(this.lastID || this.changes || 1);
-        }
-      });
-    });
+
+    const trimmed = sql.trim().toUpperCase().replace(/;+$/, '');
+    let info;
+    // 事务命令不能作为预编译语句，需用 exec() 直接执行
+    if (trimmed === 'BEGIN' || trimmed === 'BEGIN TRANSACTION' ||
+        trimmed === 'COMMIT' || trimmed === 'ROLLBACK') {
+      conn.exec(sql);
+      info = { changes: 0, lastInsertRowid: 0 };
+    } else {
+      const stmt = conn.prepare(sql);
+      info = params && params.length > 0 ? stmt.run(params) : stmt.run();
+    }
+    ret = info.lastInsertRowid || info.changes || 1;
   } catch (error) {
     console.error('SQL执行失败', error);
     this.sql = sql;
     this.error = {
-      code: error.errno,
+      code: error.code || error.errno,
       message: error.message
     };
-    // 简化错误处理：SQLite不需要复杂的连接错误处理
-    // 返回0，保持与MySQL一致的错误处理行为
     ret = 0;
-  }
-  finally {
+  } finally {
     await releaseConn(conn);
   }
   return ret;
@@ -299,7 +263,7 @@ SQLite.prototype.exec = async function (sql, params, timeout) {
  * @returns {Promise<Array>}
  * @throws {TypeError} 当table参数无效时
  */
-SQLite.prototype.read = async function (table, condition, options) {
+SQLite.prototype.read = async function (table, condition = {}, options = {}) {
   // 参数校验
   if (typeof table !== 'string' || table.trim() === '') {
     throw new TypeError('table must be non-empty string');
@@ -368,6 +332,69 @@ SQLite.prototype.db = function () {
   return new DB(this);
 };
 
+/**
+ * 初始化数据库服务（保持兼容性）
+ * @returns {Promise<void>}
+ */
+SQLite.prototype.init = async function () {
+  await this.open();
+};
+
+/**
+ * 获取连接池状态信息
+ * @returns {object} 连接池状态对象
+ */
+SQLite.prototype.getPoolStats = function () {
+  if (!this._pool || !this._pool._is_initialized) {
+    return {
+      status: 'not_initialized',
+      message: '连接池未初始化'
+    };
+  }
+
+  return {
+    status: 'healthy',
+    ...this._pool.getStats()
+  };
+};
+
+/**
+ * 健康检查
+ * @returns {Promise<object>} 健康检查结果
+ */
+SQLite.prototype.healthCheck = async function () {
+  try {
+    if (this._status !== 'connected') {
+      return {
+        status: 'error',
+        message: '数据库连接未初始化'
+      };
+    }
+
+    // 执行简单的查询来检查连接状态
+    let result = await this.run('SELECT 1 as health_check');
+
+    if (result && result.length > 0 && result[0].health_check === 1) {
+      return {
+        status: 'healthy',
+        message: '数据库连接正常',
+        ...this.getPoolStats()
+      };
+    } else {
+      return {
+        status: 'error',
+        message: '健康检查查询失败'
+      };
+    }
+  } catch (error) {
+    this.log('error', '健康检查失败', error);
+    return {
+      status: 'error',
+      message: `健康检查失败: ${error.message}`
+    };
+  }
+};
+
 // /**
 //  * 获取数据库操作实例
 //  * @param {String} database - 数据库名称
@@ -417,18 +444,8 @@ SQLite.prototype.beginTransaction = async function () {
     // 标记连接为事务中
     conn._in_transaction = true;
 
-    // 开始事务
-    await new Promise((resolve, reject) => {
-      conn.run('BEGIN TRANSACTION', (error) => {
-        if (error) {
-          // 事务开始失败，清除事务标记
-          conn._in_transaction = false;
-          reject(error);
-        } else {
-          resolve();
-        }
-      });
-    });
+    // 开始事务（better-sqlite3 同步执行）
+    conn.exec('BEGIN TRANSACTION');
 
     if (this.config.debug) {
       this.log('debug', '事务开始');
@@ -438,15 +455,7 @@ SQLite.prototype.beginTransaction = async function () {
     return {
       conn,
       commit: async () => {
-        await new Promise((resolve, reject) => {
-          conn.run('COMMIT', (error) => {
-            if (error) {
-              reject(error);
-            } else {
-              resolve();
-            }
-          });
-        });
+        conn.exec('COMMIT');
         if (this.config.debug) {
           this.log('debug', '事务提交');
         }
@@ -456,15 +465,7 @@ SQLite.prototype.beginTransaction = async function () {
         await releaseConn(conn);
       },
       rollback: async () => {
-        await new Promise((resolve, reject) => {
-          conn.run('ROLLBACK', (error) => {
-            if (error) {
-              reject(error);
-            } else {
-              resolve();
-            }
-          });
-        });
+        conn.exec('ROLLBACK');
         if (this.config.debug) {
           this.log('debug', '事务回滚');
         }
@@ -474,21 +475,9 @@ SQLite.prototype.beginTransaction = async function () {
       },
       exec: async (sql, params) => {
         // 在事务中执行SQL
-        return new Promise((resolve, reject) => {
-          conn.run(sql, params || [], function (error) {
-            if (error) {
-              this.sql = error.sql;
-              this.error = {
-                code: error.errno,
-                message: error.message
-              };
-              reject(error);
-              resolve(0);
-            } else {
-              resolve(this.lastID || this.changes || 1);
-            }
-          });
-        });
+        const stmt = conn.prepare(sql);
+        const info = params && params.length > 0 ? stmt.run(params) : stmt.run();
+        return info.lastInsertRowid || info.changes || 1;
       }
     };
   } catch (error) {

package/link_model.js

@@ -38,7 +38,7 @@ class LinkModel {
  * @param {string} table 表名
  * @returns {object}
  */
-Link_model.prototype.add = async function(table) {
+LinkModel.prototype.add = async function(table) {
   var {
     key,
     value,
@@ -77,7 +77,7 @@ Link_model.prototype.add = async function(table) {
  * @param {object} sql 数据管理器
  * @returns {object} 当前对象
  */
-Link_model.prototype.init = function(sql) {
+LinkModel.prototype.init = function(sql) {
   this.sql = sql;
   return this;
 };
@@ -88,7 +88,7 @@ Link_model.prototype.init = function(sql) {
  * @param {object} value
  * @returns {object} 当前对象
  */
-Link_model.prototype.update = function(key, value) {
+LinkModel.prototype.update = function(key, value) {
   var m = this.model;
   for (var k in m) {
     var o = m[k];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_sqlite",
-    "version": "1.4.8",
+    "version": "1.5.0",
     "description": "高性能SQLite数据库操作模块，提供与mm_mysql完全兼容的API接口，支持异步操作、事务处理和批量操作",
     "main": "index.js",
     "scripts": {
@@ -38,13 +38,13 @@
         "node": ">=14.0.0"
     },
     "dependencies": {
-        "mm_expand": "^2.4.3",
-        "sqlite3": "^6.0.1",
+        "better-sqlite3": "^13.0.2",
+        "mm_expand": "^2.4.7",
         "sqlstring": "^2.3.3"
     },
     "devDependencies": {
-        "eslint": "^10.6.0",
-        "eslint-plugin-jsdoc": "^63.0.10",
+        "eslint": "^10.8.0",
+        "eslint-plugin-jsdoc": "^63.3.3",
         "mm_eslint": "^1.7.5"
     }
-}
+}

package/pool.js

@@ -1,4 +1,4 @@
-const sqlite3 = require('sqlite3').verbose();
+const Database = require('better-sqlite3');
 
 /**
  * SQLite连接池类
@@ -33,9 +33,9 @@ class SQLitePool {
       return;
     }
 
-    // 创建最小连接数
+    // 创建最小连接数（better-sqlite3是同步的，无需await）
     for (let i = 0; i < this.config.pool_min; i++) {
-      const conn = await this._createConnection();
+      const conn = this._createConnection();
       this._pool_connections.push(conn);
       this._pool_available.push(conn);
     }
@@ -86,18 +86,16 @@ class SQLitePool {
 
         // 检查是否可以创建新连接
         if (this._pool_connections.length < this.config.pool_max) {
-          this._createConnection()
-            .then(conn => {
-              this._pool_connections.push(conn);
-              conn._last_used = Date.now();
-              conn.release = () => this.releaseConn(conn);
-              cleanup();
-              resolve(conn);
-            })
-            .catch(err => {
-              cleanup();
-              reject(err);
-            });
+          try {
+            const conn = this._createConnection();
+            this._pool_connections.push(conn);
+            conn._last_used = Date.now();
+            cleanup();
+            resolve(conn);
+          } catch (err) {
+            cleanup();
+            reject(err);
+          }
           return;
         }
 
@@ -159,14 +157,10 @@ class SQLitePool {
       this._pool_reaper = null;
     }
 
-    // 关闭所有连接
+    // 关闭所有连接（better-sqlite3的close是同步的）
     this._pool_connections.forEach(conn => {
       try {
-        conn.close((err) => {
-          if (err) {
-            this.log('error', '关闭连接池连接失败', err);
-          }
-        });
+        conn.close();
       } catch (error) {
         this.log('error', '关闭连接池连接异常', error);
       }
@@ -192,21 +186,20 @@ class SQLitePool {
   }
 
   /**
-   * 创建SQLite连接
+   * 创建SQLite连接（better-sqlite3，同步创建）
    * @private
-   * @returns {Promise<object>} 数据库连接对象
+   * @returns {object} 数据库连接对象
    */
   _createConnection() {
-    return new Promise((resolve, reject) => {
-      const db = new sqlite3.Database(this._getDbFilename(), (err) => {
-        if (err) {
-          reject(err);
-        } else {
-          db.release = () => this.releaseConn(db);
-          resolve(db);
-        }
-      });
+    const db = new Database(this._getDbFilename(), {
+      timeout: this.config.connect_timeout || 5000
     });
+    // 启用WAL模式，提升并发读取性能
+    db.pragma('journal_mode = WAL');
+    // 添加release方法，兼容原有API
+    db.release = () => this.releaseConn(db);
+    db._last_used = Date.now();
+    return db;
   }
 
   /**
@@ -221,11 +214,11 @@ class SQLitePool {
       const conn = this._pool_available[i];
       if (conn._last_used && now - conn._last_used > idle_timeout) {
         // 关闭并移除空闲连接
-        conn.close((err) => {
-          if (err) {
-            this.log('error', '关闭空闲连接失败', err);
-          }
-        });
+        try {
+          conn.close();
+        } catch (error) {
+          this.log('error', '关闭空闲连接失败', error);
+        }
 
         // 从连接池中移除
         const conn_idx = this._pool_connections.indexOf(conn);
@@ -238,4 +231,4 @@ class SQLitePool {
   }
 }
 
-module.exports = SQLitePool;
+module.exports = SQLitePool;

package/sql.js

@@ -7,6 +7,10 @@ const SqlString = require('sqlstring');
 const { Base } = require('mm_expand');
 
 function escape(value, stringifyObjects, timeZone) {
+  if (typeof value === 'string') {
+    // SQLite使用双单引号('')转义，不使用反斜杠转义
+    return "'" + value.replace(/'/g, "''") + "'";
+  }
   return SqlString.escape(value, stringifyObjects, timeZone);
 }
 
@@ -19,6 +23,48 @@ function escapeId(value, forbidQualified) {
  * @property {Function} filter 设置并过滤参数
  */
 class Sql extends Base {
+  /**
+   * 过滤查询参数字典
+   */
+  static config = {
+    /**
+     * 分隔符 用于查询时的多条件处理
+     */
+    'separator': '|',
+    /**
+     * 过滤
+     */
+    'filter': {
+      /**
+       * 表名
+       */
+      'table': 'table',
+      /**
+       * 查询的页码
+       */
+      'page': 'page',
+      /**
+       * 查询每页条数
+       */
+      'size': 'size',
+      /**
+       * 操作方式: 传入参数method=add, 支持参数 add增、del删、set改、get查，为空则为get
+       */
+      'method': 'method',
+      /**
+       * 排序
+       */
+      'orderby': 'orderby',
+      /**
+       * 查询显示的字段
+       */
+      'field': 'field',
+      /**
+       * 统计结果: 统计符合条件的结果数，只有当page等于1或0时才会统计
+       */
+      'count_ret': 'count_ret'
+    }
+  };
   /**
    * @description 数据库管理器
    * @param {Function} run 查询函数
@@ -102,49 +148,6 @@ class Sql extends Base {
      */
     this.count_ret = 'false';
 
-    /**
-     * 过滤查询参数字典
-     */
-    this.config = {
-      /**
-       * 分隔符 用于查询时的多条件处理
-       */
-      'separator': '|',
-      /**
-       * 过滤
-       */
-      'filter': {
-        /**
-         * 表名
-         */
-        'table': 'table',
-        /**
-         * 查询的页码
-         */
-        'page': 'page',
-        /**
-         * 查询每页条数
-         */
-        'size': 'size',
-        /**
-         * 操作方式: 传入参数method=add, 支持参数 add增、del删、set改、get查，为空则为get
-         */
-        'method': 'method',
-        /**
-         * 排序
-         */
-        'orderby': 'orderby',
-        /**
-         * 查询显示的字段
-         */
-        'field': 'field',
-        /**
-         * 统计结果: 统计符合条件的结果数，只有当page等于1或0时才会统计
-         */
-        'count_ret': 'count_ret'
-      }
-    };
-
     this.like = false;
   }
 }
@@ -154,20 +157,17 @@ class Sql extends Base {
  * @returns {object} 返回当前对象
  */
 Sql.prototype.clear = function () {
-  this.where = '';
-  this.set = '';
-  this.order = '';
-  this.view = '';
+  // 不重置run和exec方法引用，保留构造函数中设置的函数
   this.sql = '';
-  this.error = '';
-  this.like = true;
-  this.config = {};
-  this.param = {};
+  this.error = null;
+  this.results = [];
+  this.table = '';
   this.page = 0;
-  this.size = 0;
-  this.run = null;
-  this.exec = null;
-  return this;
+  this.size = 30;
+  this.method = '';
+  this.field = '';
+  this.orderby = '';
+  this.count_ret = 'false';
 };
 
 /**
@@ -705,6 +705,11 @@ Sql.prototype.toWhere = function (obj, like) {
   if (like) {
     for (var k in obj) {
       var val = obj[k];
+      if (Array.isArray(val)) {
+        var vals = val.map(function(o) { return escape(o); });
+        where += ' and ' + escapeId(k) + ' in (' + vals.join(', ') + ')';
+        continue;
+      }
       val = escape(val);
       if (k.endsWith('_min')) {
         where += ' and ' + escapeId(k.replace('_min', '')) + ' >= ' + val;
@@ -713,7 +718,7 @@ Sql.prototype.toWhere = function (obj, like) {
       } else if (k.endsWith('_not')) {
         where += ' and ' + escapeId(k.replace('_not', '')) + ' != ' + val;
       } else if (k.endsWith('_has')) {
-        var vals = val.trim("'").split(',').map((o) => {
+        var vals = val.trim("'").split(',').map(function(o) {
           return escape(o);
         });
         where += ' and ' + escapeId(k.replace('_has', '')) + ' in (' + vals.join(',') + ')';
@@ -728,6 +733,11 @@ Sql.prototype.toWhere = function (obj, like) {
   } else {
     for (var k in obj) {
       var val = obj[k];
+      if (Array.isArray(val)) {
+        var vals = val.map(function(o) { return escape(o); });
+        where += ' and ' + escapeId(k) + ' in (' + vals.join(', ') + ')';
+        continue;
+      }
       val = escape(val);
       if (k.endsWith('_min')) {
         where += ' and ' + escapeId(k.replace('_min', '')) + ' >= ' + val;
@@ -736,7 +746,7 @@ Sql.prototype.toWhere = function (obj, like) {
       } else if (k.endsWith('_not')) {
         where += ' and ' + escapeId(k.replace('_not', '')) + ' != ' + val;
       } else if (k.endsWith('_has')) {
-        var vals = val.trim("'").split(',').map((o) => {
+        var vals = val.trim("'").split(',').map(function(o) {
           return escape(o);
         });
         where += ' and ' + escapeId(k.replace('_has', '')) + ' in (' + vals.join(',') + ')';
@@ -906,7 +916,7 @@ Sql.prototype.set = async function (query, body, like) {
  * @param {number} timeout 超时时间（毫秒），默认5000ms
  * @returns {Promise|Array} 查询结果
  */
-Sql.prototype.get = async function (query, sort, view, like, timeout = 5000) {
+Sql.prototype.get = async function (query, sort, view, like, timeout = 20000) {
   if (!this.table) {
     throw new Error('表名未设置');
   }
@@ -979,7 +989,7 @@ Sql.prototype.addOrSet = async function (where, set, like) {
  * @param {number} timeout 超时时间（毫秒），默认30000ms
  * @returns {Promise | number} 记录数
  */
-Sql.prototype.count = async function (query, like, timeout = 30000) {
+Sql.prototype.count = async function (query, like, timeout = 20000) {
   if (!this.table) {
     throw new Error('表名未设置');
   }
@@ -1068,7 +1078,7 @@ Sql.prototype.toBatchAddSql = function (list) {
   let columns = keys.join(',');
 
   // 构建值部分
-  let values = [];
+  let val_list = [];
   for (let item of list) {
     let values = [];
     for (let k of keys) {
@@ -1076,11 +1086,11 @@ Sql.prototype.toBatchAddSql = function (list) {
       let val = item[key];
       values.push(this.escape(val));
     }
-    values.push(`(${values.join(',')})`);
+    val_list.push(`(${values.join(',')})`);
   }
 
   // 生成最终SQL
-  let sql = `INSERT INTO \`${this.table}\` (${columns}) VALUES ${values.join(',')}`;
+  let sql = `INSERT INTO \`${this.table}\` (${columns}) VALUES ${val_list.join(',')}`;
   return sql;
 };
 
@@ -1159,7 +1169,7 @@ Sql.prototype.setList = async function (list, like = false, batch_size = 100, ti
   if (list.length <= batch_size) {
     let sql = '';
     for (let item of list) {
-      sql += this.toSetSql(item.query, item.obj, like);
+      sql += this.toSetSql(item.query, item.item, like);
     }
     this.sql = sql;
     return await this.exec(sql, [], timeout);
@@ -1182,7 +1192,7 @@ Sql.prototype.setList = async function (list, like = false, batch_size = 100, ti
 
       let batch_sql = '';
       for (let item of batch) {
-        batch_sql += this.toSetSql(item.query, item.obj, like);
+        batch_sql += this.toSetSql(item.query, item.item, like);
       }
 
       final_res = await this.exec(batch_sql, [], timeout);
@@ -1225,7 +1235,7 @@ Sql.prototype.has = function (param_dt, sql_dt) {
  * @param {object} sql_dt sql模板集合
  * @returns {string|undefined} 没有模板则返回名称，都有则返回undefined
  */
-Sql.prototype.noPrm = function (param_dt, sql_dt) {
+Sql.prototype.not = function (param_dt, sql_dt) {
   var name;
   for (var key in param_dt) {
     if (!sql_dt[key]) {
@@ -1242,11 +1252,14 @@ Sql.prototype.noPrm = function (param_dt, sql_dt) {
  * @param {object} sql_dt sql模板集合
  * @returns {object} 返回过滤后的参数集合
  */
-Sql.prototype.filtPrm = function (param_dt, sql_dt) {
-  var dt = [];
+Sql.prototype.filterParams = function (param_dt, sql_dt) {
+  var dt = {};
+  if (!param_dt || !sql_dt) {
+    return dt;
+  }
   for (var key in param_dt) {
     if (!sql_dt[key]) {
-      dt.Add(key, o.Value);
+      dt[key] = param_dt[key];
     }
   }
   return dt;
@@ -1302,9 +1315,10 @@ Sql.prototype.tplQuery = function (param_dt, sql_dt) {
     } else {
       for (var key in param_dt) {
         var value = this.escape(param_dt[key]);
-        if (sql_dt[key]) {
+        let sql = sql_dt[key];
+        if (sql) {
           // 使用直接替换方式，避免模板替换错误
-          sql += ' && ' + sql_dt[key].replaceAll('{0}', value.trim("'"));
+          sql += ' && ' + sql.replaceAll('{0}', value.trim("'"));
         } else {
           sql += ' && ' + this.escapeId(key) + ' = ' + value;
         }
@@ -1356,9 +1370,10 @@ Sql.prototype.tplBody = function (param_dt, sql_dt) {
   } else {
     for (var key in param_dt) {
       var value = this.escape(param_dt[key]);
-      if (sql_dt[key]) {
+      let sql = sql_dt[key];
+      if (sql) {
         // 使用直接替换方式，避免模板替换错误
-        let replaced = sql_dt[key].replaceAll('{0}', value.trim("'"));
+        let replaced = sql.replaceAll('{0}', value.trim("'"));
         sql += ', ' + replaced.replace('+ -', '- ').replace('- -', '+ ');
       } else {
         sql += ', ' + this.escapeId(key) + ' = ' + value;
@@ -1413,7 +1428,7 @@ Sql.prototype.model = function (model) {
  * @param {number} timeout 超时时间（毫秒），默认30000ms
  * @returns {Promise | object | null} 查询结果
  */
-Sql.prototype.getObj = async function (query, sort, view, like, timeout = 30000) {
+Sql.prototype.getObj = async function (query, sort, view, like, timeout = 20000) {
   // 保存当前分页设置
   let old_page = this.page;
   let size = this.size;