dream-common 1.1.27 → 1.1.29
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/CryptoJS/HttpData.js +14 -7
- package/package.json +1 -1
package/lib/CryptoJS/HttpData.js
CHANGED
|
@@ -4,14 +4,21 @@ import {decodeBase58,encodeBase58} from "./Base58";
|
|
|
4
4
|
export const reqEncrypt = (orgId, content) => {
|
|
5
5
|
return reqDataEncrypt(orgId,"1.0.0","MD5","AES", content);
|
|
6
6
|
}
|
|
7
|
-
export const respDecrypt = (
|
|
8
|
-
|
|
7
|
+
export const respDecrypt = (respData = {}) => {
|
|
8
|
+
let signData = respData.signData.toString();
|
|
9
|
+
let encData = respData.encData.toString();
|
|
10
|
+
console.log("签名：")
|
|
11
|
+
console.log(signData)
|
|
9
12
|
try {
|
|
10
|
-
if (
|
|
11
|
-
return
|
|
13
|
+
if (respData.encType === "NONE") {
|
|
14
|
+
return respData.data;
|
|
12
15
|
} else {
|
|
13
|
-
let
|
|
14
|
-
let encData
|
|
16
|
+
let signData = respData.signData.toString();
|
|
17
|
+
let encData = respData.encData.toString();
|
|
18
|
+
console.log("签名：")
|
|
19
|
+
console.log(signData)
|
|
20
|
+
signData = decodeBase58(signData);
|
|
21
|
+
encData = aesDecrypt(md5_16(signData),decodeBase58(encData));
|
|
15
22
|
let obj = {};
|
|
16
23
|
let pairs = encData.split('&');
|
|
17
24
|
for (let i = 0; i < pairs.length; i++) {
|
|
@@ -31,7 +38,7 @@ export const respDecrypt = (obj = {}) => {
|
|
|
31
38
|
try {
|
|
32
39
|
return JSON.parse(obj.data);
|
|
33
40
|
} catch (e) {
|
|
34
|
-
return obj.data;
|
|
41
|
+
return obj.data || null;
|
|
35
42
|
}
|
|
36
43
|
}
|
|
37
44
|
} catch (e) {
|