From a9c448ebc53ad0cb1ba0a734d8e26d1653fc7f44 Mon Sep 17 00:00:00 2001 From: liyuetong Date: Wed, 15 Dec 2021 17:47:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E5=AF=86=E7=A0=81=E5=8A=A0?= =?UTF-8?q?=E5=AF=86=E8=A7=A3=E5=AF=86--v2=E7=8E=AF=E5=A2=83=EF=BC=8C?= =?UTF-8?q?=E5=B0=81=E8=A3=85=E5=8A=A0=E5=AF=86=E8=A7=A3=E5=AF=86=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/utils/cryptoJsUtil.js | 28 ++++++++++++++-- src/assets/js/utils/cryptoJsUtilV2.js | 47 --------------------------- src/assets/js/utils/request.js | 9 ++--- src/config/index.js | 4 +-- 4 files changed, 32 insertions(+), 56 deletions(-) delete mode 100644 src/assets/js/utils/cryptoJsUtilV2.js diff --git a/src/assets/js/utils/cryptoJsUtil.js b/src/assets/js/utils/cryptoJsUtil.js index c0e940fc8..0c2ee6c4e 100644 --- a/src/assets/js/utils/cryptoJsUtil.js +++ b/src/assets/js/utils/cryptoJsUtil.js @@ -27,7 +27,30 @@ export let RSAEncrypt = function(data, publicKey) { // crypt.setPrivateKey(privateKey) // return crypt.decrypt(data) // } -// AES加密 + +export let AESEncryptV2 = function(data, keys) { + //加密V2 + var key = CryptoJS.enc.Hex.parse(keys) + var iv = CryptoJS.enc.Utf8.parse('0123456789ABCDEF') //偏移量 + var encrypted = CryptoJS.AES.encrypt(data, key, { + iv: iv, + mode: CryptoJS.mode.CBC, + padding: CryptoJS.pad.Pkcs7 + }) + return encrypted.toString() +} +export let AESDecryptV2 = function(encrypted, keys) { + //解密V2 + var key = CryptoJS.enc.Hex.parse(keys) + var iv = CryptoJS.enc.Utf8.parse('0123456789ABCDEF') + var decrypted = CryptoJS.AES.decrypt(encrypted, key, { + iv: iv, + mode: CryptoJS.mode.CBC, + padding: CryptoJS.pad.Pkcs7 + }) + return CryptoJS.enc.Utf8.stringify(decrypted) +} +// AES加密V3 export let AESEncrypt = function(data, key) { var key = CryptoJS.enc.Utf8.parse(key) var iv = CryptoJS.enc.Utf8.parse('0123456789ABCDEF') @@ -38,9 +61,8 @@ export let AESEncrypt = function(data, key) { }) return encrypted.toString() } -// AES解密 +// AES解密V3 export let AESDecrypt = function(encrypted, key) { - //解密 var key = CryptoJS.enc.Utf8.parse(key) var iv = CryptoJS.enc.Utf8.parse('0123456789ABCDEF') var decrypted = CryptoJS.AES.decrypt(encrypted, key, { diff --git a/src/assets/js/utils/cryptoJsUtilV2.js b/src/assets/js/utils/cryptoJsUtilV2.js deleted file mode 100644 index 1282179f0..000000000 --- a/src/assets/js/utils/cryptoJsUtilV2.js +++ /dev/null @@ -1,47 +0,0 @@ -import CryptoJS from 'crypto-js' -export default { - AESEncrypt: function(data, keys) { - //加密 - var key = CryptoJS.enc.Hex.parse(keys) - var iv = CryptoJS.enc.Utf8.parse('0123456789ABCDEF') //偏移量 - var encrypted = CryptoJS.AES.encrypt(data, key, { - iv: iv, - mode: CryptoJS.mode.CBC, - padding: CryptoJS.pad.Pkcs7 - }) - return encrypted.toString() - }, - AESDecrypt: function(encrypted, keys) { - //解密 - var key = CryptoJS.enc.Hex.parse(keys) - var iv = CryptoJS.enc.Utf8.parse('0123456789ABCDEF') - var decrypted = CryptoJS.AES.decrypt(encrypted, key, { - iv: iv, - mode: CryptoJS.mode.CBC, - padding: CryptoJS.pad.Pkcs7 - }) - return CryptoJS.enc.Utf8.stringify(decrypted) - }, - AESCacheEncrypt: function(data, keys) { - //加密 緩存 - var key = CryptoJS.enc.Hex.parse(keys) - var iv = CryptoJS.enc.Utf8.parse('0123456789ABCDEF') //偏移量 - var encrypted = CryptoJS.AES.encrypt(data, key, { - iv: iv, - mode: CryptoJS.mode.CBC, - padding: CryptoJS.pad.Pkcs7 - }) - return encrypted.toString() - }, - AESCacheDecrypt: function(encrypted, keys) { - //解密 緩存 - var key = CryptoJS.enc.Hex.parse(keys) - var iv = CryptoJS.enc.Utf8.parse('0123456789ABCDEF') - var decrypted = CryptoJS.AES.decrypt(encrypted, key, { - iv: iv, - mode: CryptoJS.mode.CBC, - padding: CryptoJS.pad.Pkcs7 - }) - return CryptoJS.enc.Utf8.stringify(decrypted) - } -} diff --git a/src/assets/js/utils/request.js b/src/assets/js/utils/request.js index ae9d0f4b2..a91ba9d50 100644 --- a/src/assets/js/utils/request.js +++ b/src/assets/js/utils/request.js @@ -1,8 +1,9 @@ import axios from 'axios' -import AESToolsV2 from '@/assets/js/utils/cryptoJsUtilV2' import { MD5, RSAEncrypt, + AESEncryptV2, + AESDecryptV2, AESEncrypt, AESDecrypt, randomString, @@ -200,7 +201,7 @@ service.interceptors.request.use( } }else if(configApp.API_VERSION == 'v2'){ config.headers['signature'] = MD5(timeStr + CacheUtils.getLocItem('token')) - let encrypt = AESToolsV2.AESEncrypt(JSON.stringify(config.data), configApp.REQ_PWD) + let encrypt = AESEncryptV2(JSON.stringify(config.data), configApp.REQ_PWD) config.data = { data: encrypt } } } @@ -266,8 +267,8 @@ service.interceptors.response.use( res = JSON.parse(AESDecrypt(res.response, masterKey)) }else if(configApp.API_VERSION == 'v2'){ // 使用固定密钥解密返回结果data - res = JSON.parse(AESToolsV2.AESDecrypt(res.response, configApp.REQ_PWD)) - console.log(JSON.parse(AESToolsV2.AESDecrypt(res.response, configApp.REQ_PWD)),'JSON.parse(AESDecrypt(res.response, configApp.REQ_PWD))') + res = JSON.parse(AESDecryptV2(res.response, configApp.REQ_PWD)) + console.log(res,'JSON.parse(AESDecrypt(res.response, configApp.REQ_PWD))') } } } diff --git a/src/config/index.js b/src/config/index.js index 8915ead85..cdd9a9635 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -19,7 +19,7 @@ let apiDomain, imgDomain, assetsUrl, mainUrl, payUrl, zssqUrl, REQ_PWD, CACHE_EN console.log('环境：', process.env.VUE_APP_FLAG) switch (process.env.VUE_APP_FLAG) { case 'dev': - apiDomain = 'https://iagentsales-test2.e-guofu.com:5200/api/v2' // 国富api ///api/v1 + apiDomain = 'https://iagentsales-test2.e-guofu.com:5200/api/v3' // 国富api ///api/v1 imgDomain = 'https://iagentsales-test3.e-guofu.com:5443/updown' // dev // 静态服务资源 assetsUrl = 'https://iagentsales-test2.e-guofu.com:443/app/' @@ -31,7 +31,7 @@ switch (process.env.VUE_APP_FLAG) { // zssqUrl = 'https://iagentsales-test2.e-guofu.com:5100/html/test/index.html#/' REQ_PWD = '41424344454631323334353637383930' CACHE_ENCRYP = '41424344454631323334353637383930' - API_VERSION = 'v2' + API_VERSION = 'v3' break case 'uat': apiDomain = 'https://iagentsales-test2.e-guofu.com:5200/api/v1' // 国富api