cgserver 6.1.9 → 6.2.2

package/dist/lib/Core/Core.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.core = void 0;
-let Md5 = require("md5");
 let os = require('os');
 let request = require('request');
 const _ = require("underscore");
+const crypto = require("crypto");
 /**
  * 常用的工具函数类
  */
@@ -321,13 +321,14 @@ class core {
         newStr += last;
         return newStr;
     }
-    static md5 = function (data) {
-        let str = data;
-        if (!core.isString(data)) {
-            str = JSON.stringify(data);
-        }
-        return Md5(str);
-    };
+    static md5(str) {
+        let md5_str = crypto.createHash('md5').update(str).digest('hex');
+        return md5_str;
+    }
+    static sha1(str) {
+        let sha1_str = crypto.createHash('sha1').update(str).digest('hex');
+        return sha1_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

@@ -299,7 +299,7 @@ class MongoManager {
                     money = true;
                 }
             }
-            if (money) {
+            if (!money) {
                 updatemodel = { "$set": model };
             }
             else {

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "6.1.9",
+  "version": "6.2.2",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
@@ -35,7 +35,6 @@
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.13",
     "@types/formidable": "^2.0.0",
-    "@types/md5": "^2.3.1",
     "@types/mime": "^2.0.3",
     "@types/mssql": "^7.1.5",
     "@types/mysql": "^2.15.19",
@@ -61,7 +60,6 @@
     "https": "^1.0.0",
     "jsonc": "^2.0.0",
     "log4js": "^6.3.0",
-    "md5": "^2.3.0",
     "mime": "^3.0.0",
     "mongodb": "^4.2.1",
     "mssql": "^8.0.2",
@@ -80,7 +78,5 @@
     "webpack": "^5.73.0",
     "webpack-node-externals": "^3.0.0",
     "websocket": "^1.0.34"
-  },
-  "devDependencies": {
   }
 }