cgserver 9.2.0 → 9.2.2

package/README.md

@@ -1,3 +1,5 @@
+9.2.1
+1、增强提示
 9.2.0
 1、mysql 更换为mysql2
 9.1.23

package/dist/lib/Framework/Database/MysqlBaseService.js

@@ -5,7 +5,6 @@ const Property_1 = require("./Decorator/Property");
 const MysqlManager_1 = require("./MysqlManager");
 const Log_1 = require("../Logic/Log");
 const DBCache_1 = require("./Decorator/DBCache");
-const IServerConfig_1 = require("../Config/IServerConfig");
 class BaseModel {
 }
 exports.BaseModel = BaseModel;
@@ -42,7 +41,7 @@ class MysqlBaseService {
             throw new Error("数据表的类必须要具有Table装饰器");
         }
         this._table = "`" + table.table + "`";
-        if (!IServerConfig_1.GServerCfg.db.mysql.auto) {
+        if (!MysqlManager_1.GMysqlMgr.cfg.auto) {
             //未开启自动创建数据表
             return;
         }
@@ -148,8 +147,8 @@ class MysqlBaseService {
         sql += " limit 1";
         let tm = null;
         let sr = await MysqlManager_1.GMysqlMgr.query(sql, args);
-        if (sr.list && sr.list.length > 0) {
-            tm = sr.list[0];
+        if (sr.queryResult && sr.queryResult.length > 0) {
+            tm = sr.queryResult[0];
         }
         return tm;
     }
@@ -162,8 +161,8 @@ class MysqlBaseService {
         }
         let total = 0;
         let sr = await MysqlManager_1.GMysqlMgr.query(sql, args);
-        if (sr.list && sr.list.length > 0) {
-            total = sr.list[0].num || 0;
+        if (sr.queryResult && sr.queryResult.length > 0) {
+            total = sr.queryResult[0].num || 0;
         }
         return total;
     }
@@ -176,7 +175,7 @@ class MysqlBaseService {
         }
         let tms = null;
         let sr = await MysqlManager_1.GMysqlMgr.query(sql, args);
-        tms = sr.list;
+        tms = sr.queryResult;
         return tms;
     }
     async getCount(where, args) {
@@ -203,7 +202,7 @@ class MysqlBaseService {
         args.push(num);
         let tms = null;
         let sr = await MysqlManager_1.GMysqlMgr.query(sql, args);
-        tms = sr.list;
+        tms = sr.queryResult;
         return tms;
     }
     async updateProperty(set, where, args, limit) {

package/dist/lib/Framework/Database/MysqlManager.js

@@ -14,7 +14,6 @@ class SqlReturn {
     error = null;
     result = null;
     fields = null;
-    list = null;
     get queryResult() {
         return this.result;
     }
@@ -35,6 +34,10 @@ class MysqlManager {
     get isValid() {
         return !!this._pool;
     }
+    _cfg = null;
+    get cfg() {
+        return this._cfg;
+    }
     constructor() {
     }
     async init(cfg) {
@@ -43,6 +46,7 @@ class MysqlManager {
             || !cfg.open) {
             return;
         }
+        this._cfg = cfg;
         this._pool = mysql2.createPool(cfg.poolcfg);
         console.log("mysql config=" + JSON.stringify(cfg));
         //这个的初始化位置不能变，必须位于cbs前，pool后
@@ -67,13 +71,6 @@ class MysqlManager {
         try {
             const [result, fields] = await this._pool.query(sqlStr, values);
             sr.result = result;
-            let rs = result;
-            if (rs && rs.length) {
-                sr.list = [];
-                for (let i = 0; i < rs.length; ++i) {
-                    sr.list.push(rs[i]);
-                }
-            }
             sr.fields = fields;
         }
         catch (error) {

package/dist/lib/Framework/WebServer/Engine/Engine.js

@@ -98,12 +98,13 @@ class Engine {
                     let time_str = (Date.now() - time) + "ms";
                     Log_1.GLog.info("[" + time_str + "] " + req.method + " " + req.url);
                 }
-            }).catch(() => {
+            }).catch((err) => {
                 res.sendStatus(500);
                 let exreq = new Request_1.Request(req, this._cfg);
                 let info = exreq.getDebugInfo();
                 info["tip"] = "server error";
                 Log_1.GLog.error(info);
+                Log_1.GLog.error(err);
             });
         });
     }

package/dist/types/Framework/Database/MysqlManager.d.ts

@@ -8,7 +8,6 @@ export declare class SqlReturn {
     error: any;
     result: mysql2.QueryResult;
     fields: any;
-    list: Array<any>;
     get queryResult(): mysql2.RowDataPacket[];
     get execResult(): mysql2.ResultSetHeader;
 }
@@ -21,10 +20,12 @@ declare class MysqlManager {
     protected _init_cbs: any[];
     protected _pool: mysql2.Pool;
     get isValid(): boolean;
+    protected _cfg: MysqlConfig;
+    get cfg(): MysqlConfig;
     constructor();
     init(cfg: MysqlConfig): Promise<void>;
     registerInitCb(cb: Function): void;
-    query(sqlStr: any, values?: any): Promise<SqlReturn>;
+    query(sqlStr: string, values?: any): Promise<SqlReturn>;
     transaction(sqls: any[]): Promise<SqlReturns>;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "9.2.0",
+  "version": "9.2.2",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",