mm_mysql 2.2.0 → 2.2.2

package/sql.js

@@ -3,23 +3,24 @@
  * @author <a href="http://qww.elins.cn">邱文武</a>
  * @version 1.2
  */
-require('mm_logs');
 const {
 	escape,
 	escapeId
 } = require('mysql2');
+const { Base } = require('mm_expand');
 
 /**
  * @class 数据库语法通用类
  * @property {Function} filter 设置并过滤参数
  */
-class Sql {
+class Sql extends Base {
 	/**
 	 * 数据库管理器
 	 * @param {Function} run 查询函数
 	 * @param {Function} exec 更改函数
 	 */
 	constructor(run, exec) {
+		super();
 		/**
 		 * 查询函数
 		 */
@@ -428,18 +429,18 @@ Sql.prototype.toWhere = function (obj, like) {
 				val = val.trim("'");
 			}
 			val = escape(val);
-			if (k.endWith('_min')) {
+			if (k.endsWith('_min')) {
 				where += " and " + escapeId(k.replace('_min', "")) + " >= " + val;
-			} else if (k.endWith('_max')) {
+			} else if (k.endsWith('_max')) {
 				where += " and " + escapeId(k.replace('_max', "")) + " <= " + val;
-			} else if (k.endWith('_not')) {
+			} else if (k.endsWith('_not')) {
 				where += " and " + escapeId(k.replace('_not', "")) + " != " + val;
-			} else if (k.endWith('_has')) {
+			} else if (k.endsWith('_has')) {
 				var vals = val.trim("'").split(',').map((o) => {
 					return "'" + o + "'"
 				});
 				where += " and " + escapeId(k.replace('_has', "")) + " in (" + vals.join(',') + ")";
-			} else if (k.endWith('_like')) {
+			} else if (k.endsWith('_like')) {
 				where += " and " + escapeId(k.replace('_like', "")) + " LIKE '%" + val.trim("'") + "%'";
 			} else if (typeof (val) === "string" && !/^[0-9]+$/.test(val)) {
 				where += " and " + escapeId(k) + " LIKE '%" + val.trim("'") + "%'";
@@ -454,18 +455,18 @@ Sql.prototype.toWhere = function (obj, like) {
 				val = val.trim("'");
 			}
 			val = escape(val);
-			if (k.endWith('_min')) {
+			if (k.endsWith('_min')) {
 				where += " and " + escapeId(k.replace('_min', "")) + " >= " + val;
-			} else if (k.endWith('_max')) {
+			} else if (k.endsWith('_max')) {
 				where += " and " + escapeId(k.replace('_max', "")) + " <= " + val;
-			} else if (k.endWith('_not')) {
+			} else if (k.endsWith('_not')) {
 				where += " and " + escapeId(k.replace('_not', "")) + " != " + val;
-			} else if (k.endWith('_has')) {
+			} else if (k.endsWith('_has')) {
 				var vals = val.trim("'").split(',').map((o) => {
 					return "'" + o + "'"
 				});
 				where += " and " + escapeId(k.replace('_has', "")) + " in (" + vals.join(',') + ")";
-			} else if (k.endWith('_like')) {
+			} else if (k.endsWith('_like')) {
 				where += " and " + escapeId(k.replace('_like', "")) + " LIKE '%" + val.trim("'") + "%'";
 			} else {
 				where += " and " + escapeId(k) + " = " + val;
@@ -493,10 +494,10 @@ Sql.prototype.toSet = function (obj) {
 		}
 		val = escape(val);
 
-		if (k.endWith('_add')) {
+		if (k.endsWith('_add')) {
 			const k2 = escapeId(k.replace('_add', ""));
 			set += "," + k2 + " = " + k2 + " + " + val;
-		} else if (k.endWith('_del')) {
+		} else if (k.endsWith('_del')) {
 			const k3 = escapeId(k.replace('_del', ""));
 			set += "," + k3 + " = " + k3 + " - " + val;
 		} else {
@@ -600,26 +601,14 @@ Sql.prototype.add = async function (body) {
 		throw new Error('表名或数据未设置');
 	}
 	try {
-		// 触发前置事件
-		if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function') {
-			await $.eventer.run("mysql_add_before:" + this.table, { body });
-		}
-
 		const sql = this.toAddSql(body);
 		this.sql = sql;
-		const bl = await this.exec(sql);
-
-		// 触发后置事件
-		if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function') {
-			await $.eventer.run("mysql_add_after:" + this.table, { body, sql: this.sql, error: this.error, bl });
-		}
-
-		return bl;
+		return await this.exec(sql);
 	} catch (err) {
 		this.error = err.message;
-		$.log.error(`添加数据失败: ${err.message}`);
-		throw err;
+		this.logger('error', '添加数据失败', err);
 	}
+	return 0;
 };
 
 /**
@@ -633,26 +622,15 @@ Sql.prototype.del = async function (query, like) {
 		throw new Error('表名未设置');
 	}
 	try {
-		// 触发前置事件
-		if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function') {
-			await $.eventer.run("mysql_del_before:" + this.table, { query, like });
-		}
-
 		const sql = this.toDelSql(query, like);
 		this.sql = sql;
 		const bl = await this.exec(sql);
-
-		// 触发后置事件
-		if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function') {
-			await $.eventer.run("mysql_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;
 };
 
 /**
@@ -667,26 +645,15 @@ Sql.prototype.set = async function (query, body, like) {
 		throw new Error('表名或数据未设置');
 	}
 	try {
-		// 触发前置事件
-		if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function') {
-			await $.eventer.run("mysql_set_before:" + this.table, { query, body, like, page: this.page, size: this.size });
-		}
-
 		const sql = this.toSetSql(query, body, like);
 		this.sql = sql;
 		const bl = await this.exec(sql);
-
-		// 触发后置事件
-		if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function') {
-			await $.eventer.run("mysql_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;
 };
 
 /**
@@ -727,11 +694,6 @@ Sql.prototype.addOrSetSql = async function (where, set, like) {
 					}
 				}
 			} else {
-				// 触发前置事件
-				if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function' && typeof body === "object") {
-					await $.eventer.run("mysql_add_before:" + this.table, { body });
-				}
-
 				for (const k in set) {
 					if (!Object.prototype.hasOwnProperty.call(set, k)) continue;
 
@@ -746,36 +708,21 @@ Sql.prototype.addOrSetSql = 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("mysql_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("mysql_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("mysql_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;
 };
 
 /**
@@ -801,63 +748,19 @@ Sql.prototype.get = async function (query, sort, view, like, timeout = 60000) {
 		// 使用Promise.race实现超时控制
 		return await Promise.race([
 			(async () => {
-				// 安全触发事件，避免事件系统问题影响核心功能
-				if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function') {
-					try {
-						// 添加超时保护的事件触发
-						await Promise.race([
-							$.eventer.run("mysql_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并执行
 				const sql = this.toGetSql(query, sort, view, like);
 				this.sql = sql;
 				const list = await this.run(sql);
-
-				// 安全触发后置事件
-				if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function') {
-					try {
-						// 添加超时保护的事件触发
-						await Promise.race([
-							$.eventer.run("mysql_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}`, { sql: this.sql });
-		throw err;
+		this.logger('error', '查询数据失败', err);
 	}
+	return [];
 };
 
 /**
@@ -897,9 +800,9 @@ Sql.prototype.getObj = async function (query, sort, view, like, timeout = 60000)
 		return obj;
 	} catch (err) {
 		this.error = err.message;
-		$.log.error(`查询单条数据失败: ${err.message}`, { sql: this.sql });
-		throw err;
+		this.logger('error', '查询单条数据失败', err);
 	}
+	return null;
 };
 
 /**
@@ -922,52 +825,21 @@ Sql.prototype.count = async function (query, like, timeout = 60000) {
 
 		return await Promise.race([
 			(async () => {
-				// 安全触发事件
-				if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function') {
-					try {
-						await Promise.race([
-							$.eventer.run("mysql_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("mysql_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);
 	}
+	return 0;
 };
 
 /**
@@ -1011,13 +883,13 @@ Sql.prototype.addList = async function (list, lock = true, batchSize = 100, time
 
 				// 分批处理大数据量
 				const totalBatches = Math.ceil(list.length / batchSize);
-				$.log.info(`开始分批添加数据，共${totalBatches}批，每批${batchSize}条`);
+				this.logger('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}条`);
+					this.logger('debug', `处理第${i + 1}/${totalBatches}批数据，${batch.length}条`);
 
 					// 生成批量插入SQL
 					const batchSql = this.toBatchAddSql(batch);
@@ -1032,19 +904,15 @@ Sql.prototype.addList = async function (list, lock = true, batchSize = 100, time
 					]);
 				}
 
-				$.log.success(`批量添加数据完成，共${list.length}条`);
+				this.logger('info', `批量添加数据完成，共${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;
+		this.logger('error', '批量添加数据失败', error);
 	}
+	return 0;
 };
 
 /**
@@ -1125,7 +993,7 @@ Sql.prototype.delList = async function (list, like, batchSize = 100, timeout = 6
 
 				// 分批处理大数据量
 				const totalBatches = Math.ceil(list.length / batchSize);
-				$.log.info(`开始分批删除数据，共${totalBatches}批，每批${batchSize}条`);
+				this.logger('info', `开始分批删除数据，共${totalBatches}批，每批${batchSize}条`);
 
 				// 使用事务包装整个操作以保证原子性
 				let finalResult = null;
@@ -1136,7 +1004,7 @@ Sql.prototype.delList = async function (list, like, batchSize = 100, timeout = 6
 					// 分批处理
 					for (let i = 0; i < totalBatches; i++) {
 						const batch = list.slice(i * batchSize, (i + 1) * batchSize);
-						$.log.debug(`处理第${i + 1}/${totalBatches}批数据，${batch.length}条`);
+						this.logger('debug', `处理第${i + 1}/${totalBatches}批数据，${batch.length}条`);
 
 						let batchSql = "";
 						for (const item of batch) {
@@ -1158,23 +1026,22 @@ Sql.prototype.delList = async function (list, like, batchSize = 100, timeout = 6
 					// 发生错误时回滚事务
 					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}条`);
+				this.logger('info', `批量删除数据完成，共${list.length}条`);
 				return finalResult;
 			})(),
 			timeoutPromise
 		]);
 	} catch (err) {
 		this.error = err.message;
-		$.log.error(`批量删除数据失败: ${err.message}`);
-		throw err;
+		this.logger('error', '批量删除数据失败', err);
 	}
+	return 0;
 };
 
 /**
@@ -1199,14 +1066,14 @@ Sql.prototype.setList = async function (list, like = false, batchSize = 100, tim
 			(async () => {
 				// 分批处理大数据量
 				const totalBatches = Math.ceil(list.length / batchSize);
-				$.log.info(`开始分批修改数据，共${totalBatches}批，每批${batchSize}条`);
+				this.logger('info', `开始分批修改数据，共${totalBatches}批，每批${batchSize}条`);
 
 				let finalResult = null;
 
 				// 逐条处理记录，保持简单可靠
 				for (let i = 0; i < list.length; i++) {
 					const item = list[i];
-					$.log.debug(`处理第${i + 1}/${list.length}条记录`);
+					this.logger('debug', `处理第${i + 1}/${list.length}条记录`);
 
 					// 生成单个更新SQL
 					const sql = this.toSetSql(item.query, item.item, like);
@@ -1227,9 +1094,9 @@ Sql.prototype.setList = async function (list, like = false, batchSize = 100, tim
 		]);
 	} catch (error) {
 		this.error = error.message;
-		$.log.error(`批量修改数据失败: ${error.message}`);
-		throw error;
+		this.logger('error', '批量修改数据失败', error);
 	}
+	return 0;
 };
 
 /* 辅助类 */
@@ -1429,72 +1296,65 @@ Sql.prototype.tplBody = function (paramDt, sqlDt) {
  * @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('START 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) {
+			this.logger('debug', `开始从文件加载数据库`, {
+				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('START 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) {
+				this.logger('info', `数据库加载成功`, {
+					file: file,
+					statementCount: sqlStatements.length
+				});
+			}
+
+			return true;
+		} catch (err) {
+			// 回滚事务
+			await this.exec('ROLLBACK').catch(rollbackErr => {
+				this.logger('error', '事务回滚失败', rollbackErr);
+			});
+
+			this.logger('error', '数据库加载失败', err);
+		}
+	} catch (error) {
+		// 记录错误日志
+		this.logger('error', '数据库加载失败', error);
+	}
+	return false;
 };
 
 /**
@@ -1503,84 +1363,84 @@ 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;
 };
 
 /**
@@ -1614,7 +1474,7 @@ Sql.prototype.model = function (model) {
 					const set = {};
 					set[prop] = value;
 					_this.set(query, set, false).catch(err => {
-						$.log.error(`模型数据更新失败: ${err.message}`);
+						this.logger('error', '模型数据更新失败', err);
 					});
 				}
 			}
@@ -1631,7 +1491,7 @@ Sql.prototype.model = function (model) {
  * @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('表名、条件或数据未设置');
 	}
@@ -1662,11 +1522,6 @@ Sql.prototype.addOrSet = async function(where, set, like) {
 					}
 				}
 			} else {
-				// 触发前置事件
-				if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function' && typeof body === "object") {
-					await $.eventer.run("mysql_add_before:" + this.table, { body });
-				}
-
 				for (const k in set) {
 					if (!Object.prototype.hasOwnProperty.call(set, k)) continue;
 
@@ -1680,37 +1535,23 @@ 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("mysql_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("mysql_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("mysql_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;
 };
 
-module.exports = Sql;
+module.exports = {
+	Sql
+};