dborm-mysql 2.2.4 → 2.2.6

package/base/db.js

@@ -2,7 +2,7 @@
  * Created by hzzhangdianpeng on 2016/12/2.
  */
 
-let mysql = require('mysql');
+let mysql = require('mysql2');
 const co = require('co');
 let shortUuid = require('short-uuid');
 let moment = require('moment');
@@ -40,11 +40,12 @@ module.exports = (dbConfig, {log, noConvertDbCodes, dbCode, logExecuteTime, logg
         return new Promise(function (resolve, reject) {
             db.pool.getConnection(function (err, connection) {
                 if (err) {
-                    if(err.code === 'ECONNREFUSED' || err.code === 'ETIMEDOUT' || err.code === 'PROTOCOL_SEQUENCE_TIMEOUT'){
+                    if(err.code === 'ECONNREFUSED' || err.code === 'ETIMEDOUT' || err.code === 'ECONNRESET' || err.code === 'PROTOCOL_SEQUENCE_TIMEOUT'){
                         logger('mysql reconnect， reconnect time:', reconnectionTime++);
                         db.getConnection().then(resolve, reject);
+                    } else {
+                        reject(err);   
                     }
-                    reject(err);
                 } else {
                     connection.connectionLogId = options.transId || shortUuid().new().slice(0, 6);
                     reconnectionTime = 0;

package/index.d.ts

@@ -25,7 +25,7 @@
 /*~ This declaration specifies that the function
  *~ is the exported object from the file
  */
-import mysql = require('mysql');
+import mysql = require('mysql2');
 
 export = dbORM;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dborm-mysql",
-  "version": "2.2.4",
+  "version": "2.2.6",
   "description": "a NodeJs ORM for mysql",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,7 +9,7 @@
     "co": "^4.6.0",
     "lodash": "^4.17.4",
     "moment": "^2.24.0",
-    "mysql": "^2.14.1",
+    "mysql2": "3.16.1",
     "short-uuid": "^2.2.0",
     "util": "^0.10.3"
   },
@@ -33,4 +33,4 @@
   ],
   "author": "zhangdianp@163.com",
   "license": "ISC"
-}
+}