mm_sqlite 1.1.4 → 1.1.5

package/sql.js

@@ -3,8 +3,8 @@
  * @author <a href="http://qww.elins.cn">邱文武</a>
  * @version 1.2
  */
-require('mm_logs');
 const SqlString = require('sqlstring');
+const { Base } = require('mm_expand');
 
 function escape(value, stringifyObjects, timeZone) {
 	return SqlString.escape(value, stringifyObjects, timeZone);
@@ -18,13 +18,14 @@ function escapeId(value, forbidQualified) {
  * @class 数据库语法通用类
  * @property {Function} filter 设置并过滤参数
  */
-class Sql {
+class Sql extends Base {
 	/**
 	 * @description 数据库管理器
 	 * @param {Function} run 查询函数
 	 * @param {Function} exec 更改函数
 	 */
 	constructor(run, exec) {
+		super();
 		/**
 		 * 查询函数
 		 */
@@ -38,7 +39,7 @@ class Sql {
 		 * @param {Object} value 值
 		 * @return {String} 返回执行结果
 		 */
-		this.escape = function(value) {
+		this.escape = function (value) {
 			return escape(value);
 		};
 
@@ -47,7 +48,7 @@ class Sql {
 		 * @param {String} key 键
 		 * @return {String} 返回执行结果
 		 */
-		this.escapeId = function(key) {
+		this.escapeId = function (key) {
 			return escapeId(key);
 		};
 
@@ -152,7 +153,7 @@ class Sql {
  * @description 清空查询条件
  * @return {Object} 返回当前对象
  */
-Sql.prototype.clear = function() {
+Sql.prototype.clear = function () {
 	this.where = "";
 	this.set = "";
 	this.order = "";
@@ -173,7 +174,7 @@ Sql.prototype.clear = function() {
  * @description 过滤查询参数
  * @param {Object} query 查询参数
  */
-Sql.prototype.filter = function(query) {
+Sql.prototype.filter = function (query) {
 	var m = this.config.filter;
 	for (var k in m) {
 		var key = m[k];
@@ -191,7 +192,7 @@ Sql.prototype.filter = function(query) {
  * @param {String} view 返回的字段
  * @return {String} 返回查询条件语句
  */
-Sql.prototype.toQuery = function(where, sort, view) {
+Sql.prototype.toQuery = function (where, sort, view) {
 	var sql = "SELECT {1} FROM `{0}`";
 	if (!view) {
 		view = "*";
@@ -216,7 +217,7 @@ Sql.prototype.toQuery = function(where, sort, view) {
  * @param {String} val 用作增加的值集合
  * @return {Promise|Object} 执行结果
  */
-Sql.prototype.addSql = function(key, val) {
+Sql.prototype.addSql = function (key, val) {
 	var sql = "INSERT INTO `{0}` ({1}) VALUES ({2});";
 	sql = sql.replace("{0}", this.table).replace("{1}", key).replace("{2}", val);
 	return this.exec(sql);
@@ -226,7 +227,7 @@ Sql.prototype.addSql = function(key, val) {
  * @param {String} where  删除条件
  * @return {Promise|Object} 执行结果
  */
-Sql.prototype.delSql = function(where) {
+Sql.prototype.delSql = function (where) {
 	var sql = "DELETE FROM `{0}` WHERE {1};";
 	sql = sql.replace("{0}", this.table).replace("{1}", where);
 	return this.exec(sql);
@@ -237,7 +238,7 @@ Sql.prototype.delSql = function(where) {
  * @param {String} set 修改的键值
  * @return {Promise|Object} 执行结果
  */
-Sql.prototype.setSql = function(where, set) {
+Sql.prototype.setSql = function (where, set) {
 	var sql = "UPDATE `{0}` SET {1} WHERE {2};";
 	sql = sql.replace("{0}", this.table).replace("{1}", set).replace("{2}", where);
 	return this.exec(sql);
@@ -249,7 +250,7 @@ Sql.prototype.setSql = function(where, set) {
  * @param {String} view 显示的字段
  * @return {Promise|Array} 查询结果数组
  */
-Sql.prototype.getSql = function(where, sort, view) {
+Sql.prototype.getSql = function (where, sort, view) {
 	var sql = this.toQuery(where, sort, view);
 	return this.run(sql);
 };
@@ -260,7 +261,7 @@ Sql.prototype.getSql = function(where, sort, view) {
  * @param {String} set 修改的键值
  * @return {Promise|Object} 执行结果
  */
-Sql.prototype.addOrSetSql = async function(where, set, like) {
+Sql.prototype.addOrSetSql = async function (where, set) {
 	if (!where || !set) {
 		return -1;
 	}
@@ -287,7 +288,7 @@ Sql.prototype.addOrSetSql = async function(where, set, like) {
  * @param {String} where 查询条件
  * @return {Promise|Number} 返回结果总数
  */
-Sql.prototype.countSql = async function(where) {
+Sql.prototype.countSql = async function (where) {
 	var sql = "SELECT count(*) count FROM `" + this.table + "`";
 	if (where) {
 		sql += ' WHERE ' + where;
@@ -307,7 +308,7 @@ Sql.prototype.countSql = async function(where) {
  * @param {String} view 返回的字段
  * @return {Promise|Object} 查询到的内容列表和符合条件总数
  */
-Sql.prototype.getCountSql = async function(where, sort, view) {
+Sql.prototype.getCountSql = async function (where, sort, view) {
 	var list = [];
 	var count = await this.countSql(where);
 	if (count > 0) {
@@ -328,7 +329,7 @@ Sql.prototype.getCountSql = async function(where, sort, view) {
  * @param {String} sort 排序方式
  * @return {Promise|Object} 查询到的内容列表和符合条件总数
  */
-Sql.prototype.groupMathSql = async function(where, groupby, view, sort, method) {
+Sql.prototype.groupMathSql = async function (where, groupby, view, sort, method) {
 	if (!view) {
 		view = "*"
 	}
@@ -370,7 +371,7 @@ Sql.prototype.groupMathSql = async function(where, groupby, view, sort, method)
  * @param {String} sort 排序方式
  * @return {Promise|Object} 查询到的内容列表和符合条件总数
  */
-Sql.prototype.groupAvgSql = async function(where, groupby, view, sort = "") {
+Sql.prototype.groupAvgSql = async function (where, groupby, view, sort = "") {
 	return await this.groupMathSql(where, groupby, view, sort, "AVG");
 };
 
@@ -382,7 +383,7 @@ Sql.prototype.groupAvgSql = async function(where, groupby, view, sort = "") {
  * @param {String} sort 排序方式
  * @return {Promise|Object} 查询到的内容列表和符合条件总数
  */
-Sql.prototype.groupSumSql = async function(where, groupby, view, sort = "") {
+Sql.prototype.groupSumSql = async function (where, groupby, view, sort = "") {
 	return await this.groupMathSql(where, groupby, view, sort, "SUM");
 };
 
@@ -393,7 +394,7 @@ Sql.prototype.groupSumSql = async function(where, groupby, view, sort = "") {
  * @param {String} view 返回的字段
  * @return {Promise|Object} 查询到的内容列表和符合条件总数
  */
-Sql.prototype.groupCountSql = async function(where, groupby, view, sort = "") {
+Sql.prototype.groupCountSql = async function (where, groupby, view, sort = "") {
 	return await this.groupMathSql(where, groupby, view, sort, "COUNT");
 };
 
@@ -406,7 +407,7 @@ Sql.prototype.groupCountSql = async function(where, groupby, view, sort = "") {
  * @param {String} sort 排序方式
  * @return {Promise|Object} 查询到的内容列表和符合条件总数
  */
-Sql.prototype.groupMath = async function(query, groupby, view, sort, method) {
+Sql.prototype.groupMath = async function (query, groupby, view, sort, method) {
 	var where = this.toWhere(query, this.like);
 	return await this.groupMathSql(where, groupby, view, sort, method);
 };
@@ -419,7 +420,7 @@ Sql.prototype.groupMath = async function(query, groupby, view, sort, method) {
  * @param {String} sort 排序方式
  * @return {Promise|Object} 查询到的内容列表和符合条件总数
  */
-Sql.prototype.groupAvg = async function(query, groupby, view, sort) {
+Sql.prototype.groupAvg = async function (query, groupby, view, sort) {
 	return await this.groupMath(query, groupby, view, sort, "AVG");
 };
 
@@ -431,7 +432,7 @@ Sql.prototype.groupAvg = async function(query, groupby, view, sort) {
  * @param {String} sort 排序方式
  * @return {Promise|Object} 查询到的内容列表和符合条件总数
  */
-Sql.prototype.groupSum = async function(query, groupby, view, sort) {
+Sql.prototype.groupSum = async function (query, groupby, view, sort) {
 	return await this.groupMath(query, groupby, view, sort, "SUM");
 };
 
@@ -442,7 +443,7 @@ Sql.prototype.groupSum = async function(query, groupby, view, sort) {
  * @param {String} view 返回的字段
  * @return {Promise|Object} 查询到的内容列表和符合条件总数
  */
-Sql.prototype.groupCount = async function(query, groupby, view, sort) {
+Sql.prototype.groupCount = async function (query, groupby, view, sort) {
 	return await this.groupMath(query, groupby, view, sort, "COUNT");
 };
 
@@ -453,7 +454,7 @@ Sql.prototype.groupCount = async function(query, groupby, view, sort) {
  * @param {Boolean} like 是否使用like匹配, 默认不使用
  * @return {String} where格式sql语句字符串
  */
-Sql.prototype.toWhere = function(obj, like) {
+Sql.prototype.toWhere = function (obj, like) {
 	var where = "";
 	if (like === undefined) {
 		like = this.like;
@@ -461,7 +462,7 @@ Sql.prototype.toWhere = function(obj, like) {
 	if (like) {
 		for (var k in obj) {
 			var val = obj[k];
-			if (val && typeof(val) === "string") {
+			if (val && typeof (val) === "string") {
 				val = val.trim("'");
 			}
 			val = escape(val);
@@ -478,7 +479,7 @@ Sql.prototype.toWhere = function(obj, like) {
 				where += " and " + escapeId(k.replace('_has', '')) + " in (" + vals.join(',') + ")";
 			} else if (k.endWith('_like')) {
 				where += " and " + escapeId(k.replace('_like', '')) + " LIKE '%" + val.trim("'") + "%'";
-			} else if (typeof(val) === "string" && !/^[0-9]+$/.test(val)) {
+			} else if (typeof (val) === "string" && !/^[0-9]+$/.test(val)) {
 				where += " and " + escapeId(k) + " LIKE '%" + val.trim("'") + "%'"
 			} else {
 				where += " and " + escapeId(k) + " = " + val;
@@ -487,7 +488,7 @@ Sql.prototype.toWhere = function(obj, like) {
 	} else {
 		for (var k in obj) {
 			var val = obj[k];
-			if (val && typeof(val) === "string") {
+			if (val && typeof (val) === "string") {
 				val = val.trim("'");
 			}
 			val = escape(val);
@@ -515,7 +516,7 @@ Sql.prototype.toWhere = function(obj, like) {
  * @param {Object} obj 用作拼接的对象
  * @return {String} set格式sql语句字符串
  */
-Sql.prototype.toSet = function(obj) {
+Sql.prototype.toSet = function (obj) {
 	var set = "";
 	for (var k in obj) {
 		if (!Object.prototype.hasOwnProperty.call(obj, k)) continue;
@@ -546,7 +547,7 @@ Sql.prototype.toSet = function(obj) {
  * @param {Object} item 用作添加的键值
  * @return {String} sql语句
  */
-Sql.prototype.toAddSql = function(item) {
+Sql.prototype.toAddSql = function (item) {
 	if (!this.table || !item || typeof item !== 'object') {
 		throw new Error('表名或数据未设置');
 	}
@@ -573,7 +574,7 @@ Sql.prototype.toAddSql = function(item) {
  * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {String} sql语句
  */
-Sql.prototype.toDelSql = function(query, like) {
+Sql.prototype.toDelSql = function (query, like) {
 	if (!this.table) {
 		throw new Error('表名未设置');
 	}
@@ -589,7 +590,7 @@ Sql.prototype.toDelSql = function(query, like) {
  * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {String} sql语句
  */
-Sql.prototype.toSetSql = function(query, item, like) {
+Sql.prototype.toSetSql = function (query, item, like) {
 	if (!this.table) {
 		throw new Error('表名未设置');
 	}
@@ -607,7 +608,7 @@ Sql.prototype.toSetSql = function(query, item, like) {
  * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {String} sql语句
  */
-Sql.prototype.toGetSql = function(query, sort, view, like) {
+Sql.prototype.toGetSql = function (query, sort, view, like) {
 	var where = this.toWhere(query, like);
 	return this.toQuery(where, sort, view);
 };
@@ -617,30 +618,21 @@ Sql.prototype.toGetSql = function(query, sort, view, like) {
  * @param {Object} body 添加的对象
  * @return {Promise|Object} 执行结果
  */
-Sql.prototype.add = async function(body) {
+Sql.prototype.add = async function (body) {
 	if (!this.table || !body || typeof body !== 'object') {
 		throw new Error('表名或数据未设置');
 	}
 	try {
-		// 触发前置事件
-		if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function') {
-			await $.eventer.run("sqlite_add_before:" + this.table, { body });
-		}
-
 		var sql = this.toAddSql(body);
 		this.sql = sql;
 		var bl = await this.exec(sql);
 
-		// 触发后置事件
-		if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function') {
-			await $.eventer.run("sqlite_add_after:" + this.table, { body, sql: this.sql, error: this.error, bl });
-		}
-
 		return bl;
 	} catch (err) {
 		this.error = err.message;
-		$.log.error(`添加数据失败: ${err.message}`);
-		throw err;
+		this.logger('error', '添加数据失败', err);
+		// 返回默认操作结果对象，保持返回值类型一致
+		return 0;
 	}
 };
 /**
@@ -649,30 +641,21 @@ Sql.prototype.add = async function(body) {
  * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {Promise|Object} 执行结果
  */
-Sql.prototype.del = async function(query, like) {
+Sql.prototype.del = async function (query, like) {
 	if (!this.table) {
 		throw new Error('表名未设置');
 	}
 	try {
-		// 触发前置事件
-		if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function') {
-			await $.eventer.run("sqlite_del_before:" + this.table, { query, like });
-		}
-
 		var sql = this.toDelSql(query, like);
 		this.sql = sql;
 		var bl = await this.exec(sql);
 
-		// 触发后置事件
-		if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function') {
-			await $.eventer.run("sqlite_del_after:" + this.table, { query, like, sql: this.sql, error: this.error, bl });
-		}
-
 		return bl;
 	} catch (err) {
 		this.error = err.message;
-		$.log.error(`删除数据失败: ${err.message}`);
-		throw err;
+		this.logger('error', '删除数据失败', err);
+		// 返回默认操作结果对象，保持返回值类型一致
+		return 0;
 	}
 };
 
@@ -683,30 +666,20 @@ Sql.prototype.del = async function(query, like) {
  * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {Promise|Object} 执行结果
  */
-Sql.prototype.set = async function(query, body, like) {
+Sql.prototype.set = async function (query, body, like) {
 	if (!this.table || !body || typeof body !== 'object') {
 		throw new Error('表名或数据未设置');
 	}
 	try {
-		// 触发前置事件
-		if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function') {
-			await $.eventer.run("sqlite_set_before:" + this.table, { query, body, like, page: this.page, size: this.size });
-		}
-
 		var sql = this.toSetSql(query, body, like);
 		this.sql = sql;
 		var bl = await this.exec(sql);
-
-		// 触发后置事件
-		if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function') {
-			await $.eventer.run("sqlite_set_after:" + this.table, { query, body, like, page: this.page, size: this.size, sql: this.sql, error: this.error, bl });
-		}
-
 		return bl;
 	} catch (err) {
 		this.error = err.message;
-		$.log.error(`修改数据失败: ${err.message}`);
-		throw err;
+		this.logger('error', '修改数据失败', err);
+		// 返回默认操作结果对象，保持返回值类型一致
+		return 0;
 	}
 };
 
@@ -719,7 +692,7 @@ Sql.prototype.set = async function(query, body, like) {
  * @param {Number} timeout 超时时间（毫秒），默认30000ms
  * @return {Promise|Array} 查询结果
  */
-Sql.prototype.get = async function(query, sort, view, like, timeout = 30000) {
+Sql.prototype.get = async function (query, sort, view, like, timeout = 30000) {
 	if (!this.table) {
 		throw new Error('表名未设置');
 	}
@@ -733,62 +706,19 @@ Sql.prototype.get = async function(query, sort, view, like, timeout = 30000) {
 		// 使用Promise.race实现超时控制
 		return await Promise.race([
 			(async () => {
-				// 安全触发事件，避免事件系统问题影响核心功能
-				if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function') {
-					try {
-						// 添加超时保护的事件触发
-						await Promise.race([
-							$.eventer.run("sqlite_get_before:" + this.table, {
-								query,
-								sort,
-								view,
-								like,
-								page: this.page,
-								size: this.size
-							}),
-							new Promise((_, reject) => setTimeout(() => reject(new Error('事件处理超时')), 5000))
-						]);
-					} catch (eventError) {
-						$.log.warn(`事件处理失败，但不影响查询: ${eventError.message}`);
-					}
-				}
-
 				// 生成SQL并执行
 				var sql = this.toGetSql(query, sort, view, like);
 				this.sql = sql;
 				var list = await this.run(sql);
-
-				// 安全触发后置事件
-				if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function') {
-					try {
-						// 添加超时保护的事件触发
-						await Promise.race([
-							$.eventer.run("sqlite_get_after:" + this.table, {
-								query,
-								sort,
-								view,
-								like,
-								page: this.page,
-								size: this.size,
-								sql: this.sql,
-								error: this.error,
-								list
-							}),
-							new Promise((_, reject) => setTimeout(() => reject(new Error('事件处理超时')), 5000))
-						]);
-					} catch (eventError) {
-						$.log.warn(`事件处理失败，但不影响查询返回: ${eventError.message}`);
-					}
-				}
-
 				return list;
 			})(),
 			timeoutPromise
 		]);
 	} catch (err) {
 		this.error = err.message;
-		$.log.error(`查询数据失败: ${err.message}`);
-		throw err;
+		this.logger('error', '查询数据失败', err);
+		// 返回空数组作为默认值，保持返回值类型一致
+		return [];
 	}
 };
 
@@ -806,7 +736,7 @@ Sql.prototype.get = async function(query, sort, view, like, timeout = 30000) {
  * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {Promise<Object>} 执行结果
  */
-Sql.prototype.addOrSet = async function(where, set, like) {
+Sql.prototype.addOrSet = async function (where, set, like) {
 	if (!this.table || !where || !set) {
 		throw new Error('表名、条件或数据未设置');
 	}
@@ -837,11 +767,6 @@ Sql.prototype.addOrSet = async function(where, set, like) {
 					}
 				}
 			} else {
-				// 触发前置事件
-				if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function' && typeof body === "object") {
-					await $.eventer.run("sqlite_add_before:" + this.table, { body });
-				}
-
 				for (const k in set) {
 					if (!Object.prototype.hasOwnProperty.call(set, k)) continue;
 
@@ -856,35 +781,21 @@ Sql.prototype.addOrSet = async function(where, set, like) {
 
 			const bl = await this.addSql(key.replace(",", ""), value.replace(",", ""));
 
-			// 触发后置事件
-			if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function' && typeof body === "object") {
-				await $.eventer.run("sqlite_add_after:" + this.table, { body, sql: this.sql, error: this.error, bl });
-			}
-
 			return bl;
 		} else {
-			// 触发前置事件
-			if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function' && typeof set === "object") {
-				await $.eventer.run("sqlite_set_before:" + this.table, { query, body, like, page: this.page, size: this.size, sql: this.sql });
-			}
-
 			if (typeof set === "object") {
 				set = await this.toSet(set);
 			}
 
 			const bl1 = await this.setSql(whereStr, set);
 
-			// 触发后置事件
-			if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function' && typeof body === "object") {
-				await $.eventer.run("sqlite_set_after:" + this.table, { query, body, like, page: this.page, size: this.size, sql: this.sql, error: this.error, bl: bl1 });
-			}
-
 			return bl1;
 		}
 	} catch (err) {
 		this.error = err.message;
-		$.log.error(`添加或修改数据失败: ${err.message}`);
-		throw err;
+		this.logger('error', '添加或修改数据失败', err);
+		// 返回默认操作结果对象，保持返回值类型一致
+		return 0;
 	}
 };
 
@@ -895,7 +806,7 @@ Sql.prototype.addOrSet = async function(where, set, like) {
  * @param {Number} timeout 超时时间（毫秒），默认30000ms
  * @return {Promise|Number} 记录数
  */
-Sql.prototype.count = async function(query, like, timeout = 30000) {
+Sql.prototype.count = async function (query, like, timeout = 30000) {
 	if (!this.table) {
 		throw new Error('表名未设置');
 	}
@@ -908,18 +819,6 @@ Sql.prototype.count = async function(query, like, timeout = 30000) {
 
 		return await Promise.race([
 			(async () => {
-				// 安全触发事件
-				if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function') {
-					try {
-						await Promise.race([
-							$.eventer.run("sqlite_count_before:" + this.table, { query, like }),
-							new Promise((_, reject) => setTimeout(() => reject(new Error('事件处理超时')), 5000))
-						]);
-					} catch (eventError) {
-						$.log.warn(`事件处理失败，但不影响统计: ${eventError.message}`);
-					}
-				}
-
 				// 正确生成count SQL
 				const where = typeof query === 'string' ? query : await this.toWhere(query, like);
 				const sql = "SELECT COUNT(*) as num FROM `" + this.table + "`" + (where ? " WHERE " + where : "");
@@ -927,32 +826,15 @@ Sql.prototype.count = async function(query, like, timeout = 30000) {
 				const list = await this.run(sql);
 				const total = list && list[0] && list[0].num ? parseInt(list[0].num) : 0;
 
-				// 安全触发事件
-				if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function') {
-					try {
-						await Promise.race([
-							$.eventer.run("sqlite_count_after:" + this.table, {
-								query,
-								like,
-								sql: this.sql,
-								error: this.error,
-								total
-							}),
-							new Promise((_, reject) => setTimeout(() => reject(new Error('事件处理超时')), 5000))
-						]);
-					} catch (eventError) {
-						$.log.warn(`事件处理失败，但不影响统计返回: ${eventError.message}`);
-					}
-				}
-
 				return total;
 			})(),
 			timeoutPromise
 		]);
 	} catch (err) {
 		this.error = err.message;
-		$.log.error(`统计记录数失败: ${err.message}`, { sql: this.sql });
-		throw err;
+		this.logger('error', '统计记录数失败', err);
+		// 返回0作为默认统计值，保持返回值类型一致
+		return 0;
 	}
 };
 
@@ -963,7 +845,7 @@ Sql.prototype.count = async function(query, like, timeout = 30000) {
  * @param {Number} timeout 超时时间（毫秒），默认30000ms
  * @return {Promise<Number>} 记录数
  */
-Sql.prototype.getCount = async function(query, like, timeout = 30000) {
+Sql.prototype.getCount = async function (query, like, timeout = 30000) {
 	return await this.count(query, like, timeout);
 };
 
@@ -971,12 +853,11 @@ Sql.prototype.getCount = async function(query, like, timeout = 30000) {
 /**
  * @description 添加多条数据
  * @param {Array} list 对象数组
- * @param {Boolean} lock 是否锁定
- * @param {Number} batchSize 批量大小，默认100
+ * @param {Number} batch_size 批量大小，默认100
  * @param {Number} timeout 超时时间，默认60000毫秒
  * @return {Promise|Object} 执行结果
  */
-Sql.prototype.addList = async function(list, lock = true, batchSize = 100, timeout = 60000) {
+Sql.prototype.addList = async function (list, batch_size = 100, timeout = 60000) {
 	if (!this.table || !Array.isArray(list) || list.length === 0) {
 		throw new Error('表名或数据列表未设置');
 	}
@@ -989,20 +870,20 @@ Sql.prototype.addList = async function(list, lock = true, batchSize = 100, timeo
 		return await Promise.race([
 			(async () => {
 				// 如果数据量较小，直接处理
-				if (list.length <= batchSize) {
+				if (list.length <= batch_size) {
 					// 使用批量插入语法，不使用事务包装
 					this.sql = this.toBatchAddSql(list);
 					return await this.exec(this.sql);
 				}
 
 				// 分批处理大数据量
-				const totalBatches = Math.ceil(list.length / batchSize);
-				$.log.info(`开始分批添加数据，共${totalBatches}批，每批${batchSize}条`);
+				const totalBatches = Math.ceil(list.length / batch_size);
+				$.log.info(`开始分批添加数据，共${totalBatches}批，每批${batch_size}条`);
 
 				// 分批执行，每批一个单独的批量插入语句
 				let finalResult = null;
 				for (let i = 0; i < totalBatches; i++) {
-					const batch = list.slice(i * batchSize, (i + 1) * batchSize);
+					const batch = list.slice(i * batch_size, (i + 1) * batch_size);
 					$.log.debug(`处理第${i + 1}/${totalBatches}批数据，${batch.length}条`);
 
 					// 生成批量插入SQL
@@ -1024,12 +905,9 @@ Sql.prototype.addList = async function(list, lock = true, batchSize = 100, timeo
 			timeoutPromise
 		]);
 	} catch (error) {
-		$.log.error(`[${this.constructor.name}] [addList]`, '批量添加数据失败', {
-			error: error.message,
-			table: this.table,
-			list_length: list.length
-		});
-		throw error;
+		this.logger('error', '批量添加数据失败', error);
+		// 返回默认操作结果对象，保持返回值类型一致
+		return 0;
 	}
 };
 
@@ -1038,7 +916,7 @@ Sql.prototype.addList = async function(list, lock = true, batchSize = 100, timeo
  * @param {Array} list 数据列表
  * @return {String} 批量插入SQL语句
  */
-Sql.prototype.toBatchAddSql = function(list) {
+Sql.prototype.toBatchAddSql = function (list) {
 	if (!this.table || !Array.isArray(list) || list.length === 0) {
 		throw new Error('表名或数据列表未设置');
 	}
@@ -1060,7 +938,7 @@ Sql.prototype.toBatchAddSql = function(list) {
 	const columns = keys.join(',');
 
 	// 构建值部分
-	const valuesList = [];
+	const values = [];
 	for (const item of list) {
 		const values = [];
 		for (const k of keys) {
@@ -1071,11 +949,11 @@ Sql.prototype.toBatchAddSql = function(list) {
 			}
 			values.push(this.escape(val));
 		}
-		valuesList.push(`(${values.join(',')})`);
+		values.push(`(${values.join(',')})`);
 	}
 
 	// 生成最终SQL
-	const sql = `INSERT INTO \`${this.table}\` (${columns}) VALUES ${valuesList.join(',')}`;
+	const sql = `INSERT INTO \`${this.table}\` (${columns}) VALUES ${values.join(',')}`;
 	return sql;
 };
 
@@ -1083,11 +961,11 @@ Sql.prototype.toBatchAddSql = function(list) {
  * 删除多条数据
  * @param {Array} list 对象数组
  * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
- * @param {Number} batchSize 每批处理数量，默认100
+ * @param {Number} batch_size 每批处理数量，默认100
  * @param {Number} timeout 超时时间（毫秒），默认60000
  * @return {Promise<Object>} 执行结果
  */
-Sql.prototype.delList = async function(list, like, batchSize = 100, timeout = 60000) {
+Sql.prototype.delList = async function (list, like, batch_size = 100, timeout = 60000) {
 	if (!this.table || !Array.isArray(list) || list.length === 0) {
 		throw new Error('表名或数据列表未设置');
 	}
@@ -1100,7 +978,7 @@ Sql.prototype.delList = async function(list, like, batchSize = 100, timeout = 60
 		return await Promise.race([
 			(async () => {
 				// 如果数据量较小，直接处理
-				if (list.length <= batchSize) {
+				if (list.length <= batch_size) {
 					let sql = "";
 					for (const item of list) {
 						sql += this.toDelSql(item.query, like);
@@ -1110,8 +988,8 @@ Sql.prototype.delList = async function(list, like, batchSize = 100, timeout = 60
 				}
 
 				// 分批处理大数据量
-				const totalBatches = Math.ceil(list.length / batchSize);
-				$.log.info(`开始分批删除数据，共${totalBatches}批，每批${batchSize}条`);
+				const totalBatches = Math.ceil(list.length / batch_size);
+				$.log.info(`开始分批删除数据，共${totalBatches}批，每批${batch_size}条`);
 
 				// 使用事务包装整个操作以保证原子性
 				let finalResult = null;
@@ -1121,7 +999,7 @@ Sql.prototype.delList = async function(list, like, batchSize = 100, timeout = 60
 
 					// 分批处理
 					for (let i = 0; i < totalBatches; i++) {
-						const batch = list.slice(i * batchSize, (i + 1) * batchSize);
+						const batch = list.slice(i * batch_size, (i + 1) * batch_size);
 						$.log.debug(`处理第${i + 1}/${totalBatches}批数据，${batch.length}条`);
 
 						let batchSql = "";
@@ -1144,11 +1022,12 @@ Sql.prototype.delList = async function(list, like, batchSize = 100, timeout = 60
 					// 发生错误时回滚事务
 					try {
 						await this.exec("ROLLBACK;", 15000);
-						$.log.error(`批量删除数据失败，事务已回滚: ${error.message}`);
+						this.logger('error', '批量删除数据失败，事务已回滚', error);
 					} catch (rollbackError) {
-						$.log.error(`批量删除数据失败，事务回滚也失败: ${rollbackError.message}`);
+						this.logger('error', '批量删除数据失败，事务回滚也失败', rollbackError);
 					}
-					throw error;
+					// 记录错误日志
+					this.logger('error', 'SQL语句执行失败', error);
 				}
 
 				$.log.success(`批量删除数据完成，共${list.length}条`);
@@ -1157,20 +1036,20 @@ Sql.prototype.delList = async function(list, like, batchSize = 100, timeout = 60
 			timeoutPromise
 		]);
 	} catch (err) {
-		this.error = err.message;
-		$.log.error(`批量删除数据失败: ${err.message}`);
-		throw err;
+		this.logger('error', '批量删除数据失败', err);
+		// 返回默认操作结果对象，保持返回值类型一致
+		return 0;
 	}
 };
 /**
  * 更新多条数据
  * @param {Array} list 对象数组
  * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
- * @param {Number} batchSize 每批处理数量，默认100
+ * @param {Number} batch_size 每批处理数量，默认100
  * @param {Number} timeout 超时时间（毫秒），默认60000
  * @return {Promise<Object>} 执行结果
  */
-Sql.prototype.setList = async function(list, like = false, batchSize = 100, timeout = 60000) {
+Sql.prototype.setList = async function (list, like = false, batch_size = 100, timeout = 60000) {
 	if (!this.table || !Array.isArray(list) || list.length === 0) {
 		throw new Error('表名或数据列表未设置');
 	}
@@ -1183,7 +1062,7 @@ Sql.prototype.setList = async function(list, like = false, batchSize = 100, time
 		return await Promise.race([
 			(async () => {
 				// 如果数据量较小，直接处理
-				if (list.length <= batchSize) {
+				if (list.length <= batch_size) {
 					let sql = "";
 					for (const item of list) {
 						sql += this.toSetSql(item.query, item.obj, like);
@@ -1193,8 +1072,8 @@ Sql.prototype.setList = async function(list, like = false, batchSize = 100, time
 				}
 
 				// 分批处理大数据量
-				const totalBatches = Math.ceil(list.length / batchSize);
-				$.log.info(`开始分批更新数据，共${totalBatches}批，每批${batchSize}条`);
+				const totalBatches = Math.ceil(list.length / batch_size);
+				$.log.info(`开始分批更新数据，共${totalBatches}批，每批${batch_size}条`);
 
 				// 使用事务包装整个操作以保证原子性
 				let finalResult = null;
@@ -1204,7 +1083,7 @@ Sql.prototype.setList = async function(list, like = false, batchSize = 100, time
 
 					// 分批处理
 					for (let i = 0; i < totalBatches; i++) {
-						const batch = list.slice(i * batchSize, (i + 1) * batchSize);
+						const batch = list.slice(i * batch_size, (i + 1) * batch_size);
 						$.log.debug(`处理第${i + 1}/${totalBatches}批数据，${batch.length}条`);
 
 						let batchSql = "";
@@ -1227,11 +1106,10 @@ Sql.prototype.setList = async function(list, like = false, batchSize = 100, time
 					// 发生错误时回滚事务
 					try {
 						await this.exec("ROLLBACK;", 15000);
-						$.log.error(`批量更新数据失败，事务已回滚: ${error.message}`);
+						this.logger('error', '批量更新数据失败，事务已回滚', error);
 					} catch (rollbackError) {
-						$.log.error(`批量更新数据失败，事务回滚也失败: ${rollbackError.message}`);
+						this.logger('error', '批量更新数据失败，事务回滚也失败', rollbackError);
 					}
-					throw error;
 				}
 
 				$.log.success(`批量更新数据完成，共${list.length}条`);
@@ -1240,9 +1118,9 @@ Sql.prototype.setList = async function(list, like = false, batchSize = 100, time
 			timeoutPromise
 		]);
 	} catch (err) {
-		this.error = err.message;
-		$.log.error(`批量更新数据失败: ${err.message}`);
-		throw err;
+		this.logger('error', '批量更新数据失败', err);
+		// 返回默认操作结果对象，保持返回值类型一致
+		return 0;
 	}
 };
 
@@ -1253,7 +1131,7 @@ Sql.prototype.setList = async function(list, like = false, batchSize = 100, time
  * @param {Object} sqlDt sql模板集合
  * @return {Bool} 有则返回true，没有则返回false
  */
-Sql.prototype.hasParam = function(paramDt, sqlDt) {
+Sql.prototype.hasParam = function (paramDt, sqlDt) {
 	var bl = false;
 	for (var key in sqlDt) {
 		var value = paramDt[key];
@@ -1271,7 +1149,7 @@ Sql.prototype.hasParam = function(paramDt, sqlDt) {
  * @param {Object} sqlDt sql模板集合
  * @return {Bool} 没有模板则返回名称，都有则返回undefined
  */
-Sql.prototype.notParam = function(paramDt, sqlDt) {
+Sql.prototype.notParam = function (paramDt, sqlDt) {
 	var name;
 	for (var key in paramDt) {
 		if (!sqlDt[key]) {
@@ -1288,7 +1166,7 @@ Sql.prototype.notParam = function(paramDt, sqlDt) {
  * @param {Object} sqlDt sql模板集合
  * @return {Object} 返回过滤后的参数集合
  */
-Sql.prototype.filterParam = function(paramDt, sqlDt) {
+Sql.prototype.filterParam = function (paramDt, sqlDt) {
 	var dt = [];
 	for (var key in paramDt) {
 		if (!sqlDt[key]) {
@@ -1304,7 +1182,7 @@ Sql.prototype.filterParam = function(paramDt, sqlDt) {
  * @param {Object} sqlDt 模板集合
  * @return {String} 返回拼接的查询参数
  */
-Sql.prototype.tplQuery = function(paramDt, sqlDt) {
+Sql.prototype.tplQuery = function (paramDt, sqlDt) {
 	var sql = "";
 	if (sqlDt) {
 		var l = this.config.separator;
@@ -1388,7 +1266,7 @@ Sql.prototype.tplQuery = function(paramDt, sqlDt) {
  * @param {Object} sqlDt 模板集合
  * @return {String} 返回拼接的查询参数
  */
-Sql.prototype.tplBody = function(paramDt, sqlDt) {
+Sql.prototype.tplBody = function (paramDt, sqlDt) {
 	var sql = "";
 	if (!sqlDt || sqlDt.length === 0) {
 		for (var key in paramDt) {
@@ -1412,11 +1290,11 @@ Sql.prototype.tplBody = function(paramDt, sqlDt) {
  * @param {Object} obj 模型对象
  * @return {Object} 返回监听操作的对象
  */
-Sql.prototype.model = function(model) {
+Sql.prototype.model = function (model) {
 	var _this = this;
 	return new Proxy(model, {
-		set: function(obj, prop, value) {
-			if (typeof(value) === "number") {
+		set: function (obj, prop, value) {
+			if (typeof (value) === "number") {
 				var n = obj[prop];
 				var cha = value - n;
 				if (cha > 0) {
@@ -1451,7 +1329,7 @@ Sql.prototype.model = function(model) {
  * @param {Number} timeout 超时时间（毫秒），默认30000ms
  * @return {Promise|Object|null} 查询结果
  */
-Sql.prototype.getObj = async function(query, sort, view, like, timeout = 30000) {
+Sql.prototype.getObj = async function (query, sort, view, like, timeout = 30000) {
 	try {
 		// 保存当前分页设置
 		const oldPage = this.page;
@@ -1479,9 +1357,9 @@ Sql.prototype.getObj = async function(query, sort, view, like, timeout = 30000)
 		return obj;
 	} catch (err) {
 		this.error = err.message;
-		$.log.error(`查询单条数据失败: ${err.message}`, { sql: this.sql });
-		throw err;
+		this.logger('error', '查询单条数据失败', err);
 	}
+	return null;
 };
 
 
@@ -1492,72 +1370,65 @@ Sql.prototype.getObj = async function(query, sort, view, like, timeout = 30000)
  * @returns {Promise<boolean>} 是否加载成功
  */
 Sql.prototype.load = async function (file) {
-  try {
-    // 记录操作日志
-    if (this.config && this.config.debug) {
-      $.log.debug(`[${this.constructor.name}] [load] 开始从文件加载数据库`, { 
-        file: file
-      });
-    }
-    
-    // 检查文件是否存在
-    if (!file.hasFile()) {
-      throw new Error(`SQL文件不存在: ${file}`);
-    }
-    
-    // 读取SQL文件内容
-    const sqlContent = await $.file.readText(file);
-    
-    if (!sqlContent || sqlContent.trim() === '') {
-      throw new Error(`SQL文件内容为空: ${file}`);
-    }
-    
-    // 分割SQL语句（按分号分割，但需要注意处理字符串中的分号）
-    const sqlStatements = this._splitSqlStatements(sqlContent);
-    
-    // 开始事务执行SQL语句
-    await this.exec('BEGIN TRANSACTION');
-    
-    try {
-      // 逐个执行SQL语句
-      for (const sql of sqlStatements) {
-        const trimmedSql = sql.trim();
-        if (trimmedSql) {
-          await this.exec(trimmedSql);
-        }
-      }
-      
-      // 提交事务
-      await this.exec('COMMIT');
-      
-      if (this.config && this.config.debug) {
-        $.log.info(`[${this.constructor.name}] [load] 数据库加载成功`, { 
-          file: file,
-          statementCount: sqlStatements.length
-        });
-      }
-      
-      return true;
-    } catch (err) {
-      // 回滚事务
-      await this.exec('ROLLBACK').catch(rollbackErr => {
-        $.log.error(`[${this.constructor.name}] [load] 事务回滚失败`, {
-          error: rollbackErr.message
-        });
-      });
-      
-      throw err;
-    }
-  } catch (error) {
-    // 记录错误日志
-    $.log.error(`[${this.constructor.name}] [load] 数据库加载失败`, {
-      error: error.message,
-      file: file
-    });
-    
-    // 抛出错误
-    throw error;
-  }
+	try {
+		// 记录操作日志
+		if (this.config && this.config.debug) {
+			$.log.debug(`[${this.constructor.name}] [load] 开始从文件加载数据库`, {
+				file: file
+			});
+		}
+
+		// 检查文件是否存在
+		if (!file.hasFile()) {
+			throw new Error(`SQL文件不存在: ${file}`);
+		}
+
+		// 读取SQL文件内容
+		const sqlContent = await $.file.readText(file);
+
+		if (!sqlContent || sqlContent.trim() === '') {
+			throw new Error(`SQL文件内容为空: ${file}`);
+		}
+
+		// 分割SQL语句（按分号分割，但需要注意处理字符串中的分号）
+		const sqlStatements = this._splitSqlStatements(sqlContent);
+
+		// 开始事务执行SQL语句
+		await this.exec('BEGIN TRANSACTION');
+
+		try {
+			// 逐个执行SQL语句
+			for (const sql of sqlStatements) {
+				const trimmedSql = sql.trim();
+				if (trimmedSql) {
+					await this.exec(trimmedSql);
+				}
+			}
+
+			// 提交事务
+			await this.exec('COMMIT');
+
+			if (this.config && this.config.debug) {
+				$.log.info(`[${this.constructor.name}] [load] 数据库加载成功`, {
+					file: file,
+					statementCount: sqlStatements.length
+				});
+			}
+
+			return true;
+		} catch (err) {
+			// 回滚事务
+			await this.exec('ROLLBACK').catch(rollbackErr => {
+				this.logger('error', '事务回滚失败', rollbackErr);
+			});
+
+			// 记录错误日志
+			this.logger('error', 'SQL语句执行失败', err);
+		}
+	} catch (error) {
+		// 记录错误日志
+		this.logger('error', '数据库加载失败', error);
+	}
 };
 
 /**
@@ -1566,84 +1437,86 @@ Sql.prototype.load = async function (file) {
  * @param {String} sqlContent - SQL内容
  * @returns {Array} SQL语句数组
  */
-Sql.prototype._splitSqlStatements = function(sqlContent) {
-  const statements = [];
-  let inString = false;
-  let stringChar = '';
-  let inComment = false;
-  let currentStatement = '';
-  
-  for (let i = 0; i < sqlContent.length; i++) {
-    const char = sqlContent[i];
-    const nextChar = i + 1 < sqlContent.length ? sqlContent[i + 1] : '';
-    
-    // 处理注释
-    if (!inString && !inComment && char === '-' && nextChar === '-') {
-      inComment = true;
-      i++; // 跳过第二个'-'
-      continue;
-    }
-    
-    if (inComment && char === '\n') {
-      inComment = false;
-      continue;
-    }
-    
-    if (inComment) {
-      continue;
-    }
-    
-    // 处理多行注释
-    if (!inString && !inComment && char === '/' && nextChar === '*') {
-      inComment = true;
-      i++; // 跳过'*'
-      continue;
-    }
-    
-    if (inComment && char === '*' && nextChar === '/') {
-      inComment = false;
-      i++; // 跳过'/'
-      continue;
-    }
-    
-    // 处理字符串
-    if (!inComment && (char === "'" || char === '"') && (!inString || stringChar === char)) {
-      // 检查是否是转义的引号
-      let escaped = false;
-      for (let j = i - 1; j >= 0; j--) {
-        if (sqlContent[j] === '\\') {
-          escaped = !escaped;
-        } else {
-          break;
-        }
-      }
-      
-      if (!escaped) {
-        if (inString && stringChar === char) {
-          inString = false;
-          stringChar = '';
-        } else if (!inString) {
-          inString = true;
-          stringChar = char;
-        }
-      }
-    }
-    
-    // 分割语句
-    if (!inString && !inComment && char === ';') {
-      statements.push(currentStatement.trim());
-      currentStatement = '';
-    } else {
-      currentStatement += char;
-    }
-  }
-  
-  // 添加最后一个语句（如果有）
-  if (currentStatement.trim()) {
-    statements.push(currentStatement.trim());
-  }
-  
-  return statements;
+Sql.prototype._splitSqlStatements = function (sqlContent) {
+	const statements = [];
+	let inString = false;
+	let stringChar = '';
+	let inComment = false;
+	let currentStatement = '';
+
+	for (let i = 0; i < sqlContent.length; i++) {
+		const char = sqlContent[i];
+		const nextChar = i + 1 < sqlContent.length ? sqlContent[i + 1] : '';
+
+		// 处理注释
+		if (!inString && !inComment && char === '-' && nextChar === '-') {
+			inComment = true;
+			i++; // 跳过第二个'-'
+			continue;
+		}
+
+		if (inComment && char === '\n') {
+			inComment = false;
+			continue;
+		}
+
+		if (inComment) {
+			continue;
+		}
+
+		// 处理多行注释
+		if (!inString && !inComment && char === '/' && nextChar === '*') {
+			inComment = true;
+			i++; // 跳过'*'
+			continue;
+		}
+
+		if (inComment && char === '*' && nextChar === '/') {
+			inComment = false;
+			i++; // 跳过'/'
+			continue;
+		}
+
+		// 处理字符串
+		if (!inComment && (char === "'" || char === '"') && (!inString || stringChar === char)) {
+			// 检查是否是转义的引号
+			let escaped = false;
+			for (let j = i - 1; j >= 0; j--) {
+				if (sqlContent[j] === '\\') {
+					escaped = !escaped;
+				} else {
+					break;
+				}
+			}
+
+			if (!escaped) {
+				if (inString && stringChar === char) {
+					inString = false;
+					stringChar = '';
+				} else if (!inString) {
+					inString = true;
+					stringChar = char;
+				}
+			}
+		}
+
+		// 分割语句
+		if (!inString && !inComment && char === ';') {
+			statements.push(currentStatement.trim());
+			currentStatement = '';
+		} else {
+			currentStatement += char;
+		}
+	}
+
+	// 添加最后一个语句（如果有）
+	if (currentStatement.trim()) {
+		statements.push(currentStatement.trim());
+	}
+
+	return statements;
 };
 
-module.exports = Sql;
+module.exports = {
+	Sql
+};