mm_mysql 2.0.7 → 2.1.0

package/index.js

@@ -20,7 +20,7 @@ class Mysql extends BaseService {
         host: '127.0.0.1',
         port: 3306,
         user: 'root',
-        password: '',
+        password: 'Asd159357',
         database: '',
         charset: 'utf8mb4',
         timezone: '+08:00',
@@ -44,19 +44,45 @@ class Mysql extends BaseService {
     }
 }
 
+/**
+ * 获取MySQL2支持的配置参数
+ * 过滤掉MySQL2不支持的参数，避免警告
+ * @returns {Object} 过滤后的配置对象
+ */
+Mysql.prototype._getValidConfig = function() {
+    // MySQL2支持的连接配置参数
+    const validKeys = [
+        'host', 'port', 'user', 'password', 'database',
+        'charset', 'timezone', 'connectTimeout',
+        'connectionLimit', 'acquireTimeout', 'waitForConnections'
+    ];
+    
+    const filteredConfig = {};
+    for (const key of validKeys) {
+        if (key in this.config && this.config[key] !== undefined) {
+            filteredConfig[key] = this.config[key];
+        }
+    }
+    
+    return filteredConfig;
+};
+
 /**
  * 打开数据库连接
  * @returns {Promise<boolean>}
  */
 Mysql.prototype.open = async function() {
     try {
+        // 使用过滤后的配置参数，避免传递无效参数
+        const validConfig = this._getValidConfig();
+        
         if (this._usePool) {
-            this._pool = mysql.createPool(this.config);
+            this._pool = mysql.createPool(validConfig);
             // 测试连接池连接
             const conn = await this._pool.getConnection();
             conn.release();
         } else {
-            this._connection = await mysql.createConnection(this.config);
+            this._connection = await mysql.createConnection(validConfig);
         }
         
         $.log.info(`[${this.constructor.name}] [open] 数据库连接成功`);

package/package.json

@@ -1,11 +1,11 @@
 {
 	"name": "mm_mysql",
-	"version": "2.0.7",
+	"version": "2.1.0",
 	"description": "这是超级美眉mysql帮助函数模块，用于便捷操作mysql，使用await方式，可以避免嵌套函数",
 	"main": "index.js",
 	"dependencies": {
-		"mm_base_service": "^1.0.0",
-		"mysql2": "^3.15.2"
+		"mm_base_service": "^1.0.2",
+		"mysql2": "^3.15.3"
 	},
 	"scripts": {
 		"start": "node index.js",

package/test.js

@@ -21,7 +21,7 @@ class TestMysql {
             host: '127.0.0.1',
             port: 3306,
             user: 'root',
-            password: '',
+            password: 'Asd159357',
             database: '', // 先不指定数据库，连接成功后再创建
             debug: true,
             connectionLimit: 5