|
|
@@ -120,19 +120,15 @@ function decryptAES(wordStr, keyStr, ivStr) {
|
|
|
}
|
|
|
let CryptoJS = createCryptoJS();
|
|
|
let wHexStr = CryptoJS.enc.Hex.parse(wordStr);
|
|
|
- let b64Data = CryptoJS.enc.Base64.stringify(wHexStr);
|
|
|
|
|
|
let key = CryptoJS.enc.Utf8.parse(keyStr);
|
|
|
- let text = CryptoJS.enc.Utf8.parse(wordStr);
|
|
|
- let decrypt = CryptoJS.AES.decrypt(text, key, {
|
|
|
+ let decrypt = (CryptoJS.enc.Base64.stringify(wHexStr),CryptoJS.AES.decrypt(wordStr, key, {
|
|
|
iv: CryptoJS.enc.Utf8.parse(ivStr),
|
|
|
mode: CryptoJS.mode.CBC,
|
|
|
- padding: CryptoJS.pad.Pkcs7
|
|
|
- });
|
|
|
- // return CryptoJS.enc.Utf8.stringify(decrypt).toString();
|
|
|
-
|
|
|
- b64Data = b64Data.toString(CryptoJS.enc.Utf8);
|
|
|
- return b64Data.toString();
|
|
|
+ padding: CryptoJS.pad.Pkcs7,
|
|
|
+ }));
|
|
|
+ decrypt = decrypt.toString(CryptoJS.enc.Utf8);
|
|
|
+ return decrypt.toString();
|
|
|
}
|
|
|
|
|
|
async function hbRequest(config, data){
|