cgserver 6.2.1 → 6.2.2

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/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.2",
   "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",