dream-common 1.1.35 → 1.1.36

package/lib/CryptoJS/HttpData.js

@@ -1,30 +1,29 @@
-import {md5_48,md5_16} from "./md5";
-import {aesEncrypt,aesDecrypt} from "./AesUtils";
-import {decodeBase58,encodeBase58} from "./Base58";
+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);
+    return reqDataEncrypt(orgId, "1.0.0", "MD5", "AES", content);
 }
-export const respDecrypt = (respData  = {})  => {
+export const respDecrypt = (respData = {}) => {
     try {
         if (respData.encType === "NONE") {
             return respData.data;
         } else {
             let signData = respData.signData.toString();
-            let encData  = respData.encData.toString();
-            let timestamp  = respData.timestamp.toString();
-            let orgId  = respData.orgId.toString();
-            encData = aesDecrypt(md5_16(orgId + signData + timestamp),encData);
-            let params = new URLSearchParams(encData);
-            console.log(params);
+            let encData = respData.encData.toString();
+            let timestamp = respData.timestamp.toString();
+            let orgId = respData.orgId.toString();
+            encData = aesDecrypt(md5_16(orgId + signData + timestamp), encData);
+            const params = encData.split(/&(?=[^&]+=)/); // 智能分割，避免值中的 & 干扰
             let obj = {}
             // 遍历所有键值对
-            for (let [key, value] of params.entries()) {
-                obj[key] = value;
+            for (let pair of params) {
+                const [key, ...rest] = pair.split('=');
+                obj[key] = rest.join('=');
             }
-
             try {
-                let data = decodeBase58(obj.data)
-                return JSON.parse(data);
+                return JSON.parse(obj.data);
             } catch (e) {
                 return obj.data || null;
             }
@@ -38,13 +37,13 @@ export const respDecrypt = (respData  = {})  => {
 }
 
 
-export const reqDataEncrypt = (orgId,version,signType,encType, content) => {
+export const reqDataEncrypt = (orgId, version, signType, encType, content) => {
     let timestamp = new Date().getTime().toString();
     let obj = {
         "orgId": orgId || "Client",
-        "version": version|| "1.0.0",
+        "version": version || "1.0.0",
         "signType": signType || "NONE",
-        "encType": encType|| "NONE",
+        "encType": encType || "NONE",
     };
     if (encType === "NONE") {
         obj.data = content;
@@ -82,8 +81,8 @@ export const reqDataEncrypt = (orgId,version,signType,encType, content) => {
         return obj;
     } catch (e) {
         console.log(e);
-        obj.signType ="NONE";
-        obj.encType ="NONE";
+        obj.signType = "NONE";
+        obj.encType = "NONE";
         obj.data = content;
         obj.timestamp = timestamp;
         return obj;

package/package.json

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