cgserver 12.2.4 → 12.2.5

package/README.md

@@ -1,5 +1,8 @@
 # 版本更新日志
 
+## v12.2.5
+- Core 统一hash接口
+
 ## v12.2.4
 - mongo 添加了mongo的执行日志
 

package/dist/lib/Framework/Core/Core.js

@@ -369,29 +369,17 @@ class core {
         newStr += last;
         return newStr;
     }
-    static md5(str, inputEncoding = null, encoding = "hex") {
-        let _md5 = crypto.createHash('md5');
+    static hash(algorithm, str, inputEncoding = null, encoding = "hex") {
+        let _hash = crypto.createHash(algorithm);
         let hash = null;
         if (inputEncoding) {
-            hash = _md5.update(str, inputEncoding);
+            hash = _hash.update(str, inputEncoding);
         }
         else {
-            hash = _md5.update(str);
+            hash = _hash.update(str);
         }
-        let md5_str = hash.digest(encoding);
-        return md5_str;
-    }
-    static sha1(str, inputEncoding = null, encoding = "hex") {
-        let _sha1 = crypto.createHash('sha1');
-        let hash = null;
-        if (inputEncoding) {
-            hash = _sha1.update(str, inputEncoding);
-        }
-        else {
-            hash = _sha1.update(str);
-        }
-        let sha1_str = hash.digest(encoding);
-        return sha1_str;
+        let hash_str = hash.digest(encoding);
+        return hash_str;
     }
     static getLocalIP = function () {
         let iptable = {};

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

@@ -42,8 +42,7 @@ export declare class core {
      * @param str
      */
     static fuzzy(str: string): string;
-    static md5(str: string, inputEncoding?: crypto.Encoding, encoding?: crypto.BinaryToTextEncoding): string;
-    static sha1(str: string, inputEncoding?: crypto.Encoding, encoding?: crypto.BinaryToTextEncoding): string;
+    static hash(algorithm: string, str: string, inputEncoding?: crypto.Encoding, encoding?: crypto.BinaryToTextEncoding): string;
     static getLocalIP: () => any;
     static getIP: () => Promise<string>;
     /**

package/package.json

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