dream-common 1.1.31 → 1.1.33

package/lib/CryptoJS/HttpData.js

@@ -12,26 +12,18 @@ export const respDecrypt = (respData  = {})  => {
             let signData = respData.signData.toString();
             let encData  = respData.encData.toString();
             let timestamp  = respData.timestamp.toString();
-            signData =  decodeBase58(signData);
-            encData = aesDecrypt(md5_16(signData + timestamp),decodeBase58(encData));
+            let orgId  = respData.orgId.toString();
+            encData = aesDecrypt(md5_16(orgId + signData + timestamp),encData);
+            console.log("解密内容：" + 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;
-                }
+            let params = new URLSearchParams(encData);
+            // 遍历所有键值对
+            for (let [key, value] of params.entries()) {
+                obj[key] = value;
             }
             try {
-                return JSON.parse(obj.data);
+                let dataValue = decodeBase58(obj.data);
+                return JSON.parse(dataValue);
             } catch (e) {
                 return obj.data || null;
             }
@@ -83,7 +75,7 @@ export const reqDataEncrypt = (orgId,version,signType,encType, content) => {
         let sign = md5_48(str);
         // 删除键为 "content" 的属性
         delete obj.data;
-        obj.encData = encodeBase58(aesEncrypt(md5_16(sign + timestamp), str));
+        obj.encData = aesEncrypt(md5_16(obj.orgId + sign + timestamp), str);
         obj.signData = encodeBase58(sign);
         obj.timestamp = timestamp;
         return obj;
@@ -95,4 +87,4 @@ export const reqDataEncrypt = (orgId,version,signType,encType, content) => {
         obj.timestamp = timestamp;
         return obj;
     }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dream-common",
-  "version": "1.1.31",
+  "version": "1.1.33",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -14,6 +14,7 @@
   "license": "ISC",
   "dependencies": {
     "bs58": "^6.0.0",
-    "crypto-js": "^4.2.0"
+    "crypto-js": "^4.2.0",
+    "js-base64": "^3.7.7"
   }
 }