cgserver 6.2.1 → 6.2.6

package/dist/lib/Core/Core.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.core = void 0;
 let os = require('os');
 let request = require('request');
-const CryptoJS = require("crypto-js");
 const _ = require("underscore");
+const crypto = require("crypto");
 /**
  * 常用的工具函数类
  */
@@ -322,17 +322,13 @@ class core {
         return newStr;
     }
     static md5(str) {
-        let md5_str = CryptoJS.MD5(str).toString(CryptoJS.enc.Hex);
+        let md5_str = crypto.createHash('md5').update(str).digest('hex');
         return md5_str;
     }
     static sha1(str) {
-        let sha1_str = CryptoJS.SHA1(str).toString(CryptoJS.enc.Hex);
+        let sha1_str = crypto.createHash('sha1').update(str).digest('hex');
         return sha1_str;
     }
-    static sha3(str) {
-        let sha3_str = CryptoJS.SHA3(str).toString(CryptoJS.enc.Hex);
-        return sha3_str;
-    }
     static getLocalIP = function () {
         let iptable = {};
         let ifaces = os.networkInterfaces();

package/dist/lib/Database/BaseMongoService.js

@@ -72,7 +72,7 @@ class BaseService {
         return rs;
     }
     aggregate(pipeline, options) {
-        let ret = MongoManager_1.GMongoMgr.aggregate(this._table);
+        let ret = MongoManager_1.GMongoMgr.aggregate(this._table, pipeline, options);
         return ret;
     }
 }

package/dist/lib/Database/MongoManager.js

@@ -133,12 +133,7 @@ class MongoManager {
         let one = null;
         try {
             let col = this._mongo.collection(collection);
-            if (!sort) {
-                one = await col.findOne(where, property);
-            }
-            else {
-                one = await (col.find(where, property).sort(sort).limit(1).next());
-            }
+            one = await col.findOne(where, { projection: property });
         }
         catch (e) {
             Log_1.GLog.error(e.stack);

package/dist/lib/SocketServer/IWebSocket.js

@@ -99,7 +99,7 @@ class IWebSocket {
             }
         }
         catch (e) {
-            Log_1.GLog.error('Received Message Handle Error: ' + e);
+            Log_1.GLog.error(this.tipKey + ' Received Message Handle Error: ' + e);
         }
     }
     _onDecode(message, ...params) {
@@ -135,11 +135,11 @@ class IWebSocket {
             && jsonData
             && jsonData.cmd != "heartbeat") {
             Log_1.GLog.info(this.tipKey + "  receive:--------", true);
-            Log_1.GLog.info(jsonData, true);
+            Log_1.GLog.info({ tipKey: this.tipKey, jsonData }, true);
         }
         if (!jsonData.cmd || jsonData.cmd == "") {
-            Log_1.GLog.error('Received Message warning: no cmd param,data=');
-            Log_1.GLog.error(jsonData);
+            Log_1.GLog.error(this.tipKey + ' Received Message warning: no cmd param,data=');
+            Log_1.GLog.error({ tipKey: this.tipKey, jsonData });
             return false;
         }
         return true;
@@ -156,16 +156,11 @@ class IWebSocket {
                     await this["receive_other_all"](jsonData); //默认支持其他所有处理消息
                 }
                 catch (e) {
-                    if (e && e.stack) {
-                        Log_1.GLog.error(e.stack);
-                    }
-                    else {
-                        Log_1.GLog.error(e + "  msg:data=" + JSON.stringify(jsonData));
-                    }
+                    Log_1.GLog.error(this.tipKey + e.stack);
                 }
             }
             else {
-                Log_1.GLog.error('Received Message warning: no cmd handle,cmd=' + jsonData.cmd);
+                Log_1.GLog.error(this.tipKey + ' Received Message warning: no cmd handle,cmd=' + jsonData.cmd);
             }
         }
         else {
@@ -173,35 +168,30 @@ class IWebSocket {
                 await this["receive_" + jsonData.cmd](jsonData);
             }
             catch (e) {
-                if (e && e.stack) {
-                    Log_1.GLog.error("error msg:data=" + JSON.stringify(jsonData) + "\n" + e.stack);
-                }
-                else {
-                    Log_1.GLog.error(e + "  msg:data=" + JSON.stringify(jsonData));
-                }
+                Log_1.GLog.error(this.tipKey + " error msg:data=" + JSON.stringify(jsonData) + "\n" + e.stack);
             }
         }
     }
     onOpen(e) {
     }
     onError(e) {
-        Log_1.GLog.info("onError:" + e.message);
+        Log_1.GLog.error(this.tipKey + " onError:" + e.message);
     }
     onClose(reasonCode, description) {
-        Log_1.GLog.info("onClose resonCode=" + reasonCode + "  des=" + description);
+        Log_1.GLog.info(this.tipKey + " onClose resonCode=" + reasonCode + "  des=" + description);
     }
     send(data) {
         if (!this.connected) {
             return;
         }
         if (!data) {
-            Log_1.GLog.error("Send Message warning:null data!");
+            Log_1.GLog.error(this.tipKey + " Send Message warning:null data!");
             return;
         }
         if (this._debug_msg
             && data.cmd != "heartbeat") {
             Log_1.GLog.info(this.tipKey + "  send:-----------------------------------", true);
-            Log_1.GLog.info(data, true);
+            Log_1.GLog.info({ tipKey: this.tipKey, data }, true);
         }
         let msg = this._onEncode(data);
         this._ws.send(msg);

package/dist/lib/cgserver.js

@@ -157,3 +157,4 @@ var Response_1 = require("./WebServer/Engine/Response");
 Object.defineProperty(exports, "Response", { enumerable: true, get: function () { return Response_1.Response; } });
 var FrameworkConfig_2 = require("./Config/FrameworkConfig");
 Object.defineProperty(exports, "WebServerConfig", { enumerable: true, get: function () { return FrameworkConfig_2.WebServerConfig; } });
+process.env.TZ = "Asia/Shanghai";

package/dist/types/Core/Core.d.ts

@@ -40,7 +40,6 @@ export declare class core {
     static fuzzy(str: string): string;
     static md5(str: string): string;
     static sha1(str: string): string;
-    static sha3(str: string): string;
     static getLocalIP: () => any;
     static getIP: () => Promise<string>;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "6.2.1",
+  "version": "6.2.6",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
@@ -33,7 +33,6 @@
     "@alicloud/sms-sdk": "^1.1.6",
     "@types/cookie-parser": "^1.4.2",
     "@types/cors": "^2.8.12",
-    "@types/crypto-js": "^4.1.1",
     "@types/express": "^4.17.13",
     "@types/formidable": "^2.0.0",
     "@types/mime": "^2.0.3",
@@ -52,7 +51,6 @@
     "colors": "^1.4.0",
     "cookie-parser": "^1.4.5",
     "cors": "^2.8.5",
-    "crypto-js": "^4.1.1",
     "ec-key": "0.0.4",
     "express": "^4.17.1",
     "fast-xml-parser": "^3.21.1",