dream-common 1.1.29 → 1.1.31
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 +7 -11
- package/package.json +1 -1
package/lib/CryptoJS/HttpData.js
CHANGED
|
@@ -5,20 +5,15 @@ export const reqEncrypt = (orgId, content) => {
|
|
|
5
5
|
return reqDataEncrypt(orgId,"1.0.0","MD5","AES", content);
|
|
6
6
|
}
|
|
7
7
|
export const respDecrypt = (respData = {}) => {
|
|
8
|
-
let signData = respData.signData.toString();
|
|
9
|
-
let encData = respData.encData.toString();
|
|
10
|
-
console.log("签名：")
|
|
11
|
-
console.log(signData)
|
|
12
8
|
try {
|
|
13
9
|
if (respData.encType === "NONE") {
|
|
14
10
|
return respData.data;
|
|
15
11
|
} else {
|
|
16
12
|
let signData = respData.signData.toString();
|
|
17
13
|
let encData = respData.encData.toString();
|
|
18
|
-
|
|
19
|
-
console.log(signData)
|
|
14
|
+
let timestamp = respData.timestamp.toString();
|
|
20
15
|
signData = decodeBase58(signData);
|
|
21
|
-
encData = aesDecrypt(md5_16(signData),decodeBase58(encData));
|
|
16
|
+
encData = aesDecrypt(md5_16(signData + timestamp),decodeBase58(encData));
|
|
22
17
|
let obj = {};
|
|
23
18
|
let pairs = encData.split('&');
|
|
24
19
|
for (let i = 0; i < pairs.length; i++) {
|
|
@@ -51,6 +46,7 @@ export const respDecrypt = (respData = {}) => {
|
|
|
51
46
|
|
|
52
47
|
|
|
53
48
|
export const reqDataEncrypt = (orgId,version,signType,encType, content) => {
|
|
49
|
+
let timestamp = new Date().getTime().toString();
|
|
54
50
|
let obj = {
|
|
55
51
|
"orgId": orgId || "Client",
|
|
56
52
|
"version": version|| "1.0.0",
|
|
@@ -65,7 +61,7 @@ export const reqDataEncrypt = (orgId,version,signType,encType, content) => {
|
|
|
65
61
|
try {
|
|
66
62
|
// 如果obj不是一个对象或者是null，直接返回它
|
|
67
63
|
if (typeof content !== 'object' || content === null || JSON.stringify(content) === "{}") {
|
|
68
|
-
obj.data =
|
|
64
|
+
obj.data = content;
|
|
69
65
|
} else {
|
|
70
66
|
obj.data = JSON.stringify(content);
|
|
71
67
|
}
|
|
@@ -87,16 +83,16 @@ export const reqDataEncrypt = (orgId,version,signType,encType, content) => {
|
|
|
87
83
|
let sign = md5_48(str);
|
|
88
84
|
// 删除键为 "content" 的属性
|
|
89
85
|
delete obj.data;
|
|
90
|
-
obj.encData = encodeBase58(aesEncrypt(md5_16(sign), str));
|
|
86
|
+
obj.encData = encodeBase58(aesEncrypt(md5_16(sign + timestamp), str));
|
|
91
87
|
obj.signData = encodeBase58(sign);
|
|
92
|
-
obj.timestamp =
|
|
88
|
+
obj.timestamp = timestamp;
|
|
93
89
|
return obj;
|
|
94
90
|
} catch (e) {
|
|
95
91
|
console.log(e);
|
|
96
92
|
obj.signType ="NONE";
|
|
97
93
|
obj.encType ="NONE";
|
|
98
94
|
obj.data = content;
|
|
99
|
-
obj.timestamp =
|
|
95
|
+
obj.timestamp = timestamp;
|
|
100
96
|
return obj;
|
|
101
97
|
}
|
|
102
98
|
}
|