dream-common 1.1.17 → 1.1.19

package/index.js

@@ -14,5 +14,7 @@ export default {
     ...require('./lib/uuid'),
     ...require('./lib/authorization'),
     ...require('./lib/json'),
+    ...require('./lib/CryptoJS/Base58'),
+    ...require('./lib/CryptoJS/HttpData'),
     ...require('./lib/CryptoJS/AesUtils')
 }

package/lib/CryptoJS/AesUtils.js

@@ -8,8 +8,8 @@ import CryptoJS from 'crypto-js'
  */
 export const aesEncrypt = (key, content) => {
     key = CryptoJS.enc.Utf8.parse(key);
-    let srcs = CryptoJS.enc.Utf8.parse(content);
-    let encrypted = CryptoJS.AES.encrypt(srcs, key, {mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7});
+    let secs = CryptoJS.enc.Utf8.parse(content);
+    let encrypted = CryptoJS.AES.encrypt(secs, key, {mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7});
     return encrypted.toString();
 }
 

package/lib/CryptoJS/Base58.js

@@ -0,0 +1,13 @@
+import bs58 from 'bs58'
+
+export const encodeBase58 = (string) => {
+    const bufferData = Buffer.from(string, 'utf8');
+    const encodedData = bs58.encode(bufferData);
+    return encodedData.toString();
+}
+export const decodeBase58 = (string) => {
+    // 对编码后的数据进行解码
+    const decodedBuffer = bs58.decode(string);
+    const value = Buffer.from(decodedBuffer).toString('utf8');
+    return value.toString();
+}

package/lib/CryptoJS/HttpData.js

@@ -0,0 +1,90 @@
+import {md5_48,md5_16} from "./md5";
+import {aesEncrypt,aesDecrypt} from "./AesUtils";
+import {decodeBase58,encodeBase58} from "./Base58";
+export const reqEncrypt = (orgId, content) => {
+    return reqDataEncrypt(orgId,"1.0.0","MD5","AES", content);
+}
+export const respDecrypt = (orgId, content) => {
+    return respDataDecrypt(orgId,"1.0.0","MD5","AES", content);
+}
+export const respDataDecrypt = (obj) => {
+    try {
+        if (typeof content === 'object' || JSON.stringify(content) !== "{}") {
+            if (obj.encType === "NONE") {
+                return obj.data;
+            } else {
+                let signStr = decodeBase58(obj.signData);
+                let encData = encodeBase58(aesDecrypt(md5_16(signStr), obj.encData));
+                let obj = {};
+                let pairs = encData.split('&');
+                for (let i = 0; i < pairs.length; i++) {
+                    let pair = pairs[i].split('=');
+                    let key = pair[0];
+                    let value = pair[1] || '';
+                    if (key.substring(key.length - 2) === '[]') {
+                        key = key.substring(0, key.length - 2);
+                        if (!obj[key]) {
+                            obj[key] = [];
+                        }
+                        obj[key].push(value);
+                    } else {
+                        obj[key] = value;
+                    }
+                }
+                return obj.data;
+            }
+        } else {
+            return obj;
+        }
+    } catch (e) {
+        return {};
+    }
+
+
+}
+
+
+export const reqDataEncrypt = (orgId,version,signType,encType, content) => {
+    let obj = {
+        "orgId": orgId,
+        "version": version,
+        "signType": signType,
+        "encType": encType,
+    };
+    try {
+        // 如果obj不是一个对象或者是null，直接返回它
+        if (typeof content !== 'object' || content === null || JSON.stringify(content) === "{}") {
+            obj.data = "";
+        } else {
+            obj.data = JSON.stringify(data);
+        }
+        // 提取对象的键到一个数组中
+        let keys = Object.keys(obj);
+        // 按照第一个字符的ASCII码递增排序
+        keys.sort((a, b) => a.charCodeAt(0) - b.charCodeAt(0));
+        // 创建一个新的对象，用于存储按排序后键值的结果
+        let sortedObj = {};
+        keys.forEach(key => {
+            sortedObj[key] = obj[key];
+        });
+        // 构建待签名字符串
+        let signStringArray = [];
+        for (let key in sortedObj) {
+            signStringArray.push(`${key}=${sortedObj[key]}`);
+        }
+        let str = signStringArray.join('&');
+        let sign = md5_48(str);
+        // 删除键为 "content" 的属性
+        delete obj.data;
+        obj.encData = encodeBase58(aesEncrypt(md5_16(sign), str));
+        obj.signData = encodeBase58(sign);
+        obj.timestamp = new Date().getTime();
+        return obj;
+    } catch (e) {
+        obj.signType ="NONE";
+        obj.encType ="NONE";
+        obj.data = content;
+        obj.timestamp = new Date().getTime();
+        return obj;
+    }
+}

package/lib/CryptoJS/md5.js

@@ -11,7 +11,7 @@ export const md5 = content => {
 }
 export const md5_16 = content => {
     let str = md5(content);
-    return str.substring(9, 24);
+    return str.substring(8, 24);
 }
 export const md5_48 = content => {
     let salt = uuid(false,16,16);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dream-common",
-  "version": "1.1.17",
+  "version": "1.1.19",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -13,6 +13,7 @@
   "author": "dreamflyZhang",
   "license": "ISC",
   "dependencies": {
-    "crypto-js": "^4.0.0"
+    "bs58": "^6.0.0",
+    "crypto-js": "^4.2.0"
   }
 }