cgserver 6.1.8 → 6.2.1

package/dist/lib/Core/Core.js

@@ -1,9 +1,9 @@
 "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 CryptoJS = require("crypto-js");
 const _ = require("underscore");
 /**
  * 常用的工具函数类
@@ -321,13 +321,18 @@ 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 = CryptoJS.MD5(str).toString(CryptoJS.enc.Hex);
+        return md5_str;
+    }
+    static sha1(str) {
+        let sha1_str = CryptoJS.SHA1(str).toString(CryptoJS.enc.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/MongoManager.js

@@ -299,14 +299,14 @@ class MongoManager {
                     money = true;
                 }
             }
-            if (money) {
+            if (!money) {
                 updatemodel = { "$set": model };
             }
             else {
                 updatemodel = model;
             }
             let col = this._mongo.collection(collection);
-            up_rs = await col.updateOne(where, model, { upsert: upsert });
+            up_rs = await col.updateOne(where, updatemodel, { upsert: upsert });
         }
         catch (e) {
             Log_1.GLog.error(e.stack);

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

@@ -38,7 +38,9 @@ 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 sha3(str: string): string;
     static getLocalIP: () => any;
     static getIP: () => Promise<string>;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "6.1.8",
+  "version": "6.2.1",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
@@ -33,9 +33,9 @@
     "@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/md5": "^2.3.1",
     "@types/mime": "^2.0.3",
     "@types/mssql": "^7.1.5",
     "@types/mysql": "^2.15.19",
@@ -52,6 +52,7 @@
     "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",
@@ -61,7 +62,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 +80,5 @@
     "webpack": "^5.73.0",
     "webpack-node-externals": "^3.0.0",
     "websocket": "^1.0.34"
-  },
-  "devDependencies": {
   }
 }