mm_sqlite 1.0.6 → 1.0.8

package/sql.js

@@ -149,21 +149,24 @@ class Sql {
 }
 
 /**
- * @description 清理存储的数据
+ * @description 清空查询条件
+ * @return {Object} 返回当前对象
  */
-Sql.prototype.clear = async function() {
-	this.run = run;
-	this.exec = exec;
+Sql.prototype.clear = function() {
+	this.where = "";
+	this.set = "";
+	this.order = "";
+	this.view = "";
 	this.sql = "";
-	this.error;
-	this.results = [];
-	this.table = "";
+	this.error = "";
+	this.like = true;
+	this.config = {};
+	this.param = {};
 	this.page = 0;
-	this.size = 30;
-	this.method = "";
-	this.field = "";
-	this.orderby = "";
-	this.count_ret = "false";
+	this.size = 0;
+	this.run = null;
+	this.exec = null;
+	return this;
 };
 
 /**
@@ -257,7 +260,7 @@ Sql.prototype.getSql = function(where, sort, view) {
  * @param {String} set 修改的键值
  * @return {Promise|Object} 执行结果
  */
-Sql.prototype.addOrSetSql = async function(where, set) {
+Sql.prototype.addOrSetSql = async function(where, set, like) {
 	if (!where || !set) {
 		return -1;
 	}
@@ -333,20 +336,20 @@ Sql.prototype.groupMathSql = async function(where, groupby, view, sort, method)
 	if (view.indexOf(",") !== -1) {
 		var arr = view.split(",");
 		for (var i = 0; i < arr.length; i++) {
-			var str = this.escapeId(arr[i]);
+			var str = escapeId(arr[i]);
 			viewStr += "," + method.toUpperCase() + "(" + str + ") " + method.toLowerCase() + "_" + str.replace(
 				/`/g, "")
 		}
 	} else {
-		viewStr = "," + method.toUpperCase() + "(" + this.escapeId(view) + ") " + method.toLowerCase() + "_" +
+		viewStr = "," + method.toUpperCase() + "(" + escapeId(view) + ") " + method.toLowerCase() + "_" +
 			view.replace(/`/g, "")
 	}
-	var sql = "SELECT " + (groupby ? this.escapeId(groupby) : "") + viewStr + " FROM `" + this.table + "`";
+	var sql = "SELECT " + (groupby ? escapeId(groupby) : "") + viewStr + " FROM `" + this.table + "`";
 	if (where) {
 		sql += ' WHERE ' + where;
 	}
 	if (groupby) {
-		sql += " GROUP BY " + this.escapeId(groupby);
+		sql += " GROUP BY " + escapeId(groupby);
 	}
 	if (sort) {
 		sql += " ORDER BY " + sort;
@@ -458,34 +461,49 @@ Sql.prototype.toWhere = function(obj, like) {
 	if (like) {
 		for (var k in obj) {
 			var val = obj[k];
+			if (val && typeof(val) === "string") {
+				val = val.trim("'");
+			}
+			val = escape(val);
 			if (k.endWith('_min')) {
-				where += " and " + this.escapeId(k.replace('_min', '')) + " >= " + this.escape(val);
+				where += " and " + escapeId(k.replace('_min', '')) + " >= " + val;
 			} else if (k.endWith('_max')) {
-				where += " and " + this.escapeId(k.replace('_max', '')) + " <= " + this.escape(val);
+				where += " and " + escapeId(k.replace('_max', '')) + " <= " + val;
 			} else if (k.endWith('_not')) {
-				where += " and " + this.escapeId(k.replace('_not', '')) + " != " + this.escape(val);
+				where += " and " + escapeId(k.replace('_not', '')) + " != " + val;
 			} else if (k.endWith('_has')) {
-				where += " and " + this.escapeId(k.replace('_has', '')) + " in (" + val + ")";
+				var vals = val.trim("'").split(',').map((o) => {
+					return "'" + o + "'"
+				});
+				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)) {
-				where += " and " + this.escapeId(k) + " LIKE '%" + this.escape(val).trim("'") + "%'"
+				where += " and " + escapeId(k) + " LIKE '%" + val.trim("'") + "%'"
 			} else {
-				where += " and " + this.escapeId(k) + " = " + val
+				where += " and " + escapeId(k) + " = " + val;
 			}
 		}
 	} else {
 		for (var k in obj) {
 			var val = obj[k];
+			if (val && typeof(val) === "string") {
+				val = val.trim("'");
+			}
+			val = escape(val);
 			if (k.endWith('_min')) {
-				where += " and " + this.escapeId(k.replace('_min', '')) + " >= " + this.escape(val.replace('_min',
-					''));
+				where += " and " + escapeId(k.replace('_min', '')) + " >= " + val;
 			} else if (k.endWith('_max')) {
-				where += " and " + this.escapeId(k.replace('_max', '')) + " <= " + this.escape(val);
+				where += " and " + escapeId(k.replace('_max', '')) + " <= " + val;
 			} else if (k.endWith('_not')) {
-				where += " and " + this.escapeId(k.replace('_not', '')) + " != " + this.escape(val);
+				where += " and " + escapeId(k.replace('_not', '')) + " != " + val;
 			} else if (k.endWith('_has')) {
-				where += " and " + this.escapeId(k.replace('_has', '')) + " in (" + val.replace(/`/gi, "") + ")";
+				var vals = val.trim("'").split(',').map((o) => {
+					return "'" + o + "'"
+				});
+				where += " and " + escapeId(k.replace('_has', '')) + " in (" + vals.join(',') + ")";
 			} else {
-				where += " and " + this.escapeId(k) + "=" + this.escape(val);
+				where += " and " + escapeId(k) + " = " + val;
 			}
 		}
 	}
@@ -500,15 +518,24 @@ Sql.prototype.toWhere = function(obj, like) {
 Sql.prototype.toSet = function(obj) {
 	var set = "";
 	for (var k in obj) {
-		var val = this.escape(obj[k]);
+		if (!Object.prototype.hasOwnProperty.call(obj, k)) continue;
+
+		var val = obj[k];
+		if (val === undefined || val === null) continue;
+
+		if (typeof val === "string") {
+			val = val.trim("'");
+		}
+		val = escape(val);
+
 		if (k.endWith('_add')) {
-			var k2 = this.escapeId(k.replace('_add', ''));
+			var k2 = escapeId(k.replace('_add', ''));
 			set += "," + k2 + " = " + k2 + " + " + val;
 		} else if (k.endWith('_del')) {
-			var k3 = this.escapeId(k.replace('_del', ''));
+			var k3 = escapeId(k.replace('_del', ''));
 			set += "," + k3 + " = " + k3 + " - " + val;
 		} else {
-			set += "," + this.escapeId(k) + " = " + val;
+			set += "," + escapeId(k) + " = " + val;
 		}
 	}
 	return set.replace(",", "");
@@ -520,11 +547,21 @@ Sql.prototype.toSet = function(obj) {
  * @return {String} sql语句
  */
 Sql.prototype.toAddSql = function(item) {
+	if (!this.table || !item || typeof item !== 'object') {
+		throw new Error('表名或数据未设置');
+	}
+
 	var key = "";
 	var val = "";
 	for (var k in item) {
-		key += "," + this.escapeId(k);
-		val += "," + this.escape(item[k]);
+		if (!Object.prototype.hasOwnProperty.call(item, k)) continue;
+
+		key += "," + escapeId(k);
+		var value = item[k];
+		if (typeof value === "string") {
+			value = value.trim("'");
+		}
+		val += "," + escape(value);
 	}
 	var sql = "INSERT INTO `{0}` ({1}) VALUES ({2});";
 	return sql.replace("{0}", this.table).replace("{1}", key.replace(",", "")).replace("{2}", val.replace(",", ""));
@@ -533,10 +570,14 @@ Sql.prototype.toAddSql = function(item) {
 /**
  * @description 转删除sql语句
  * @param {Object} query 查询键值
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {String} sql语句
  */
-Sql.prototype.toDelSql = function(query) {
-	var where = this.toWhere(query);
+Sql.prototype.toDelSql = function(query, like) {
+	if (!this.table) {
+		throw new Error('表名未设置');
+	}
+	var where = this.toWhere(query, like);
 	var sql = "DELETE FROM `{0}` WHERE {1};";
 	return sql.replace("{0}", this.table).replace("{1}", where);
 };
@@ -545,10 +586,14 @@ Sql.prototype.toDelSql = function(query) {
  * @description 转修改sql语句
  * @param {Object} query 查询的键值集合
  * @param {Object} item 修改的键值集合
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {String} sql语句
  */
-Sql.prototype.toSetSql = function(query, item) {
-	var where = this.toWhere(query);
+Sql.prototype.toSetSql = function(query, item, like) {
+	if (!this.table) {
+		throw new Error('表名未设置');
+	}
+	var where = this.toWhere(query, like);
 	var set = this.toSet(item);
 	var sql = "UPDATE `{0}` SET {1} WHERE {2};";
 	return sql.replace("{0}", this.table).replace("{1}", set).replace("{2}", where);
@@ -559,43 +604,110 @@ Sql.prototype.toSetSql = function(query, item) {
  * @param {Object} query 查询键值集合
  * @param {String} sort 排序规则
  * @param {String} view 显示的字段
- * @param {Boolean} like 是否使用like匹配, 默认使用
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {String} sql语句
  */
-Sql.prototype.toGetSql = function(query, sort, view, like = true) {
+Sql.prototype.toGetSql = function(query, sort, view, like) {
 	var where = this.toWhere(query, like);
-	var sql = this.toQuery(where, sort, view);
-	return sql;
+	return this.toQuery(where, sort, view);
 };
 /* ===  传入对象操作  === */
 /**
  * @description 增加数据
- * @param {Object} item 添加的对象
+ * @param {Object} body 添加的对象
  * @return {Promise|Object} 执行结果
  */
-Sql.prototype.add = function(item) {
-	var sql = this.toAddSql(item);
-	return this.exec(sql);
+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;
+	}
 };
 /**
  * @description 删除数据
  * @param {Object} query 查询条件集合
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {Promise|Object} 执行结果
  */
-Sql.prototype.del = function(query) {
-	var sql = this.toDelSql(query);
-	return this.exec(sql);
+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;
+	}
 };
 
 /**
  * @description 修改数据
  * @param {Object} query 查询条件集合
- * @param {Object} item 修改的键值集合
+ * @param {Object} body 修改的键值集合
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {Promise|Object} 执行结果
  */
-Sql.prototype.set = function(query, item) {
-	var sql = this.toSetSql(query, item);
-	return this.exec(sql);
+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;
+	}
 };
 
 /**
@@ -603,12 +715,81 @@ Sql.prototype.set = function(query, item) {
  * @param {Object} query 查询条件
  * @param {String} sort 排序
  * @param {String} view 返回的字段
- * @param {Boolean} like 是否使用like匹配, 默认使用
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
+ * @param {Number} timeout 超时时间（毫秒），默认30000ms
  * @return {Promise|Array} 查询结果
  */
-Sql.prototype.get = function(query, sort, view, like = true) {
-	var sql = this.toGetSql(query, sort, view, like);
-	return this.run(sql);
+Sql.prototype.get = async function(query, sort, view, like, timeout = 30000) {
+	if (!this.table) {
+		throw new Error('表名未设置');
+	}
+
+	try {
+		// 添加超时控制的Promise
+		var timeoutPromise = new Promise((_, reject) => {
+			setTimeout(() => reject(new Error('查询操作超时')), timeout);
+		});
+
+		// 使用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;
+	}
 };
 
 /**
@@ -618,30 +799,172 @@ Sql.prototype.get = function(query, sort, view, like = true) {
  * @param {Boolean} like 是否使用like匹配, 默认不使用
  * @return {Promise|Object} 执行结果
  */
+/**
+ * 添加或修改数据（存在则修改，不存在则添加）
+ * @param {Object|String} where 查询条件
+ * @param {Object|String} set 要设置的数据
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
+ * @return {Promise<Object>} 执行结果
+ */
 Sql.prototype.addOrSet = async function(where, set, like) {
-	return await this.addOrSetSql(this.toWhere(where, like), this.toSet(set));
+	if (!this.table || !where || !set) {
+		throw new Error('表名、条件或数据未设置');
+	}
+	try {
+		let query = where;
+		let body = set;
+		let whereStr;
+
+		if (typeof where === "object") {
+			whereStr = await this.toWhere(where, like);
+		} else {
+			whereStr = where;
+		}
+
+		const count = await this.countSql(whereStr);
+
+		if (count === 0) {
+			let key = "";
+			let value = "";
+
+			if (typeof set === "string") {
+				const arr = set.split(",");
+				for (const o of arr) {
+					const ar = o.split('=');
+					if (ar.length === 2) {
+						key += "," + ar[0];
+						value += "," + ar[1];
+					}
+				}
+			} 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;
+
+					key += "," + this.escapeId(k);
+					let val = set[k];
+					if (typeof val === "string") {
+						val = val.trim("'");
+					}
+					value += "," + this.escape(val);
+				}
+			}
+
+			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;
+	}
 };
 
 /**
- * @description 查询符合结果总数
- * @param {Object} query 查询条件集合
- * @param {Boolean} like 是否使用like匹配, 默认使用
- * @return {Promise|Number} 查询结果
+ * 统计记录数
+ * @param {Object} query 查询条件
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
+ * @param {Number} timeout 超时时间（毫秒），默认30000ms
+ * @return {Promise|Number} 记录数
  */
-Sql.prototype.count = function(query, like = true) {
-	return this.countSql(this.toWhere(query, like));
+Sql.prototype.count = async function(query, like, timeout = 30000) {
+	if (!this.table) {
+		throw new Error('表名未设置');
+	}
+
+	try {
+		// 添加超时控制
+		const timeoutPromise = new Promise((_, reject) => {
+			setTimeout(() => reject(new Error('统计操作超时')), timeout);
+		});
+
+		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 : "");
+				this.sql = sql;
+				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;
+	}
 };
 
 /**
- * @description 查询数据并返回符合条件总数
+ * 查询数据并返回符合条件总数
  * @param {Object} query 查询条件
- * @param {String} sort 排序
- * @param {String} view 返回的字段
- * @param {Boolean} like 是否使用like匹配, 默认使用
- * @return {Promise|Object} 查询到的内容列表和符合条件总数
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
+ * @param {Number} timeout 超时时间（毫秒），默认30000ms
+ * @return {Promise<Number>} 记录数
  */
-Sql.prototype.getCount = async function(query, sort, view, like = true) {
-	return this.getCountSql(this.toWhere(query, like), sort, view);
+Sql.prototype.getCount = async function(query, like, timeout = 30000) {
+	return await this.count(query, like, timeout);
 };
 
 /* ===  传入数组操作  === */
@@ -649,42 +972,278 @@ Sql.prototype.getCount = async function(query, sort, view, like = true) {
  * @description 添加多条数据
  * @param {Array} list 对象数组
  * @param {Boolean} lock 是否锁定
+ * @param {Number} batchSize 批量大小，默认100
+ * @param {Number} timeout 超时时间，默认60000毫秒
  * @return {Promise|Object} 执行结果
  */
-Sql.prototype.addList = function(list, lock = true) {
-	var sql = lock ? "BEGIN;\r\n" : "\r\n";
-	var len = list.length;
-	for (var i = 0; i < len; i++) {
-		sql += this.toAddSql(list[i]) + "\r\n";
+Sql.prototype.addList = async function(list, lock = true, batchSize = 100, timeout = 60000) {
+	if (!this.table || !Array.isArray(list) || list.length === 0) {
+		throw new Error('表名或数据列表未设置');
 	}
-	sql += lock ? "COMMIT;" : "";
-	return this.exec(sql);
+	try {
+		// 添加整体操作超时控制
+		const timeoutPromise = new Promise((_, reject) => {
+			setTimeout(() => reject(new Error('批量添加数据操作超时')), timeout);
+		});
+
+		return await Promise.race([
+			(async () => {
+				// 如果数据量较小，直接处理
+				if (list.length <= batchSize) {
+					// 使用批量插入语法，不使用事务包装
+					this.sql = this.toBatchAddSql(list);
+					return await this.exec(this.sql);
+				}
+
+				// 分批处理大数据量
+				const totalBatches = Math.ceil(list.length / batchSize);
+				$.log.info(`开始分批添加数据，共${totalBatches}批，每批${batchSize}条`);
+
+				// 分批执行，每批一个单独的批量插入语句
+				let finalResult = null;
+				for (let i = 0; i < totalBatches; i++) {
+					const batch = list.slice(i * batchSize, (i + 1) * batchSize);
+					$.log.debug(`处理第${i + 1}/${totalBatches}批数据，${batch.length}条`);
+
+					// 生成批量插入SQL
+					const batchSql = this.toBatchAddSql(batch);
+					this.sql = batchSql;
+
+					// 为每批操作添加超时控制
+					finalResult = await Promise.race([
+						this.exec(batchSql),
+						new Promise((_, reject) => {
+							setTimeout(() => reject(new Error(`第${i + 1}批数据处理超时`)), timeout / totalBatches);
+						})
+					]);
+				}
+
+				$.log.success(`批量添加数据完成，共${list.length}条`);
+				return finalResult;
+			})(),
+			timeoutPromise
+		]);
+	} catch (error) {
+		$.log.error(`[${this.constructor.name}] [addList]`, '批量添加数据失败', {
+			error: error.message,
+			table: this.table,
+			list_length: list.length
+		});
+		throw error;
+	}
+};
+
+/**
+ * 生成批量插入SQL语句
+ * @param {Array} list 数据列表
+ * @return {String} 批量插入SQL语句
+ */
+Sql.prototype.toBatchAddSql = function(list) {
+	if (!this.table || !Array.isArray(list) || list.length === 0) {
+		throw new Error('表名或数据列表未设置');
+	}
+
+	// 获取第一个对象的键名作为列名
+	const firstItem = list[0];
+	if (!firstItem || typeof firstItem !== 'object') {
+		throw new Error('数据格式错误');
+	}
+
+	let keys = [];
+	for (const k in firstItem) {
+		if (Object.prototype.hasOwnProperty.call(firstItem, k)) {
+			keys.push(this.escapeId(k));
+		}
+	}
+
+	// 构建列名部分
+	const columns = keys.join(',');
+
+	// 构建值部分
+	const valuesList = [];
+	for (const item of list) {
+		const values = [];
+		for (const k of keys) {
+			const unescapedKey = k.replace(/`/g, '');
+			let val = item[unescapedKey];
+			if (typeof val === "string") {
+				val = val.trim("'");
+			}
+			values.push(this.escape(val));
+		}
+		valuesList.push(`(${values.join(',')})`);
+	}
+
+	// 生成最终SQL
+	const sql = `INSERT INTO \`${this.table}\` (${columns}) VALUES ${valuesList.join(',')}`;
+	return sql;
 };
+
 /**
- * @description 删除多条数据
+ * 删除多条数据
  * @param {Array} list 对象数组
- * @return {Promise|Object} 执行结果
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
+ * @param {Number} batchSize 每批处理数量，默认100
+ * @param {Number} timeout 超时时间（毫秒），默认60000
+ * @return {Promise<Object>} 执行结果
  */
-Sql.prototype.delList = function(list) {
-	var sql = "";
-	var len = list.length;
-	for (var i = 0; i < len; i++) {
-		sql += this.toDelSql(list[i].query);
+Sql.prototype.delList = async function(list, like, batchSize = 100, timeout = 60000) {
+	if (!this.table || !Array.isArray(list) || list.length === 0) {
+		throw new Error('表名或数据列表未设置');
+	}
+	try {
+		// 添加整体操作超时控制
+		const timeoutPromise = new Promise((_, reject) => {
+			setTimeout(() => reject(new Error('批量删除数据操作超时')), timeout);
+		});
+
+		return await Promise.race([
+			(async () => {
+				// 如果数据量较小，直接处理
+				if (list.length <= batchSize) {
+					let sql = "";
+					for (const item of list) {
+						sql += this.toDelSql(item.query, like);
+					}
+					this.sql = sql;
+					return await this.exec(sql);
+				}
+
+				// 分批处理大数据量
+				const totalBatches = Math.ceil(list.length / batchSize);
+				$.log.info(`开始分批删除数据，共${totalBatches}批，每批${batchSize}条`);
+
+				// 使用事务包装整个操作以保证原子性
+				let finalResult = null;
+				try {
+					// 开始事务
+					await this.exec("BEGIN;", 15000);
+
+					// 分批处理
+					for (let i = 0; i < totalBatches; i++) {
+						const batch = list.slice(i * batchSize, (i + 1) * batchSize);
+						$.log.debug(`处理第${i + 1}/${totalBatches}批数据，${batch.length}条`);
+
+						let batchSql = "";
+						for (const item of batch) {
+							batchSql += this.toDelSql(item.query, like);
+						}
+
+						// 为每批操作添加超时控制
+						finalResult = await Promise.race([
+							this.exec(batchSql),
+							new Promise((_, reject) => {
+								setTimeout(() => reject(new Error(`第${i + 1}批数据删除超时`)), timeout / totalBatches);
+							})
+						]);
+					}
+
+					// 提交事务
+					await this.exec("COMMIT;", 15000);
+				} catch (error) {
+					// 发生错误时回滚事务
+					try {
+						await this.exec("ROLLBACK;", 15000);
+						$.log.error(`批量删除数据失败，事务已回滚: ${error.message}`);
+					} catch (rollbackError) {
+						$.log.error(`批量删除数据失败，事务回滚也失败: ${rollbackError.message}`);
+					}
+					throw error;
+				}
+
+				$.log.success(`批量删除数据完成，共${list.length}条`);
+				return finalResult;
+			})(),
+			timeoutPromise
+		]);
+	} catch (err) {
+		this.error = err.message;
+		$.log.error(`批量删除数据失败: ${err.message}`);
+		throw err;
 	}
-	return this.exec(sql);
 };
 /**
- * @description 修改多条数据
+ * 更新多条数据
  * @param {Array} list 对象数组
- * @return {Promise|Object} 执行结果
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
+ * @param {Number} batchSize 每批处理数量，默认100
+ * @param {Number} timeout 超时时间（毫秒），默认60000
+ * @return {Promise<Object>} 执行结果
  */
-Sql.prototype.setList = function(list) {
-	var sql = "";
-	var len = list.length;
-	for (var i = 0; i < len; i++) {
-		sql += this.toSetSql(list[i].query, list[i].item);
+Sql.prototype.setList = async function(list, like = false, batchSize = 100, timeout = 60000) {
+	if (!this.table || !Array.isArray(list) || list.length === 0) {
+		throw new Error('表名或数据列表未设置');
+	}
+	try {
+		// 添加整体操作超时控制
+		const timeoutPromise = new Promise((_, reject) => {
+			setTimeout(() => reject(new Error('批量更新数据操作超时')), timeout);
+		});
+
+		return await Promise.race([
+			(async () => {
+				// 如果数据量较小，直接处理
+				if (list.length <= batchSize) {
+					let sql = "";
+					for (const item of list) {
+						sql += this.toSetSql(item.query, item.obj, like);
+					}
+					this.sql = sql;
+					return await this.exec(sql);
+				}
+
+				// 分批处理大数据量
+				const totalBatches = Math.ceil(list.length / batchSize);
+				$.log.info(`开始分批更新数据，共${totalBatches}批，每批${batchSize}条`);
+
+				// 使用事务包装整个操作以保证原子性
+				let finalResult = null;
+				try {
+					// 开始事务
+					await this.exec("BEGIN;", 15000);
+
+					// 分批处理
+					for (let i = 0; i < totalBatches; i++) {
+						const batch = list.slice(i * batchSize, (i + 1) * batchSize);
+						$.log.debug(`处理第${i + 1}/${totalBatches}批数据，${batch.length}条`);
+
+						let batchSql = "";
+						for (const item of batch) {
+							batchSql += this.toSetSql(item.query, item.obj, like);
+						}
+
+						// 为每批操作添加超时控制
+						finalResult = await Promise.race([
+							this.exec(batchSql),
+							new Promise((_, reject) => {
+								setTimeout(() => reject(new Error(`第${i + 1}批数据更新超时`)), timeout / totalBatches);
+							})
+						]);
+					}
+
+					// 提交事务
+					await this.exec("COMMIT;", 15000);
+				} catch (error) {
+					// 发生错误时回滚事务
+					try {
+						await this.exec("ROLLBACK;", 15000);
+						$.log.error(`批量更新数据失败，事务已回滚: ${error.message}`);
+					} catch (rollbackError) {
+						$.log.error(`批量更新数据失败，事务回滚也失败: ${rollbackError.message}`);
+					}
+					throw error;
+				}
+
+				$.log.success(`批量更新数据完成，共${list.length}条`);
+				return finalResult;
+			})(),
+			timeoutPromise
+		]);
+	} catch (err) {
+		this.error = err.message;
+		$.log.error(`批量更新数据失败: ${err.message}`);
+		throw err;
 	}
-	return this.exec(sql);
 };
 
 /* 辅助类 */
@@ -694,7 +1253,7 @@ Sql.prototype.setList = function(list) {
  * @param {Object} sqlDt sql模板集合
  * @return {Bool} 有则返回true，没有则返回false
  */
-Sql.prototype.has_param = function(paramDt, sqlDt) {
+Sql.prototype.hasParam = function(paramDt, sqlDt) {
 	var bl = false;
 	for (var key in sqlDt) {
 		var value = paramDt[key];
@@ -712,7 +1271,7 @@ Sql.prototype.has_param = function(paramDt, sqlDt) {
  * @param {Object} sqlDt sql模板集合
  * @return {Bool} 没有模板则返回名称，都有则返回undefined
  */
-Sql.prototype.not_param = function(paramDt, sqlDt) {
+Sql.prototype.notParam = function(paramDt, sqlDt) {
 	var name;
 	for (var key in paramDt) {
 		if (!sqlDt[key]) {
@@ -729,7 +1288,7 @@ Sql.prototype.not_param = function(paramDt, sqlDt) {
  * @param {Object} sqlDt sql模板集合
  * @return {Object} 返回过滤后的参数集合
  */
-Sql.prototype.filter_param = function(paramDt, sqlDt) {
+Sql.prototype.filterParam = function(paramDt, sqlDt) {
 	var dt = [];
 	for (var key in paramDt) {
 		if (!sqlDt[key]) {
@@ -745,7 +1304,7 @@ Sql.prototype.filter_param = function(paramDt, sqlDt) {
  * @param {Object} sqlDt 模板集合
  * @return {String} 返回拼接的查询参数
  */
-Sql.prototype.tpl_query = function(paramDt, sqlDt) {
+Sql.prototype.tplQuery = function(paramDt, sqlDt) {
 	var sql = "";
 	if (sqlDt) {
 		var l = this.config.separator;
@@ -829,7 +1388,7 @@ Sql.prototype.tpl_query = function(paramDt, sqlDt) {
  * @param {Object} sqlDt 模板集合
  * @return {String} 返回拼接的查询参数
  */
-Sql.prototype.tpl_body = function(paramDt, sqlDt) {
+Sql.prototype.tplBody = function(paramDt, sqlDt) {
 	var sql = "";
 	if (!sqlDt || sqlDt.length === 0) {
 		for (var key in paramDt) {
@@ -884,37 +1443,207 @@ Sql.prototype.model = function(model) {
 };
 
 /**
- * @description 查询一条数据
+ * 查询单条数据
  * @param {Object} query 查询条件
  * @param {String} sort 排序
  * @param {String} view 返回的字段
- * @param {Boolean} like 是否like匹配
- * @return {Promise|Array} 查询结果
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
+ * @param {Number} timeout 超时时间（毫秒），默认30000ms
+ * @return {Promise|Object|null} 查询结果
  */
-Sql.prototype.getObj = async function(query, sort, view, like) {
-	this.page = 1;
-	this.size = 1;
-	var key = this.key;
-	if (key) {
-		if (view && view.indexOf(key) === -1 && view.indexOf('*') === -1) {
-			view += "," + this.escapeId(key);
-		}
-	}
-	if (like === undefined) {
-		like = this.like;
-	}
-	var sql = this.toGetSql(query, sort, view, like);
-	var list = await this.run(sql);
-	if (list.length > 0) {
-		var obj = list[0];
-		if (key) {
-			return this.model(obj);
-		} else {
-			return obj;
+Sql.prototype.getObj = async function(query, sort, view, like, timeout = 30000) {
+	try {
+		// 保存当前分页设置
+		const oldPage = this.page;
+		const oldSize = this.size;
+
+		// 设置为只查询一条
+		this.page = 1;
+		this.size = 1;
+
+		// 使用优化后的get方法
+		const list = await this.get(query, sort, view, like, timeout);
+
+		// 恢复分页设置
+		this.page = oldPage;
+		this.size = oldSize;
+
+		var obj = null;
+		if (list.length > 0) {
+			obj = list[0];
+			if (this.key) {
+				obj = this.model(obj);
+			}
 		}
-	} else {
-		return null;
+
+		return obj;
+	} catch (err) {
+		this.error = err.message;
+		$.log.error(`查询单条数据失败: ${err.message}`, { sql: this.sql });
+		throw err;
 	}
 };
 
+
+
+/**
+ * 从SQL文件加载数据库
+ * @param {String} file - SQL文件路径
+ * @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;
+  }
+};
+
+/**
+ * 分割SQL语句
+ * @private
+ * @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;
+};
+
 module.exports = Sql;