diff --git a/src/utils/encrypt/crypto.js b/src/utils/encrypt/crypto.js index f8a8294d..582b96ec 100644 --- a/src/utils/encrypt/crypto.js +++ b/src/utils/encrypt/crypto.js @@ -21,7 +21,7 @@ export const Encrypt = { } else { let res = await getPublicKey(); if (res.IsSuccess) { - PublicKey = res.Result + PublicKey = decodeURI(res.Result) sessionStorage.setItem('PublicKey', res.Result) } else { return false; diff --git a/src/utils/encrypt/index.js b/src/utils/encrypt/index.js index c92c8c1c..6019ef08 100644 --- a/src/utils/encrypt/index.js +++ b/src/utils/encrypt/index.js @@ -6,8 +6,9 @@ export const encryptConfig = async (config) => { config.headers['X-Encrypted-Key'] = encryptSecretKey; } if (config.data && Object.prototype.toString.call(config.data) === '[object Object]') { - Object.keys(config.data).forEach(key => { - config.data[key] = Crypto.AES.encrypt(config.data[key], secretKey) + Object.keys(config.data).forEach(async key => { + // config.data[key] = Crypto.AES.encrypt(config.data[key], secretKey) + config.data[key] = await Encrypt.encrypt(config.data[key]) }) } return config; diff --git a/src/utils/request.js b/src/utils/request.js index 033579db..7cc7d22c 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -22,9 +22,13 @@ service.interceptors.request.use( var language = zzSessionStorage.getItem('lang') config.headers['Accept-Language'] = language === 'en' ? 'en-US,en;q=0.5' : 'zh-CN,zh;q=0.9' config.headers['TimeZoneId'] = moment.tz.guess() - if (config.ENCRYPT) { - config = await encryptConfig(config) - } + // if (config.ENCRYPT) { + // try{ + // config = await encryptConfig(config) + // }catch(err){ + // console.log(err) + // } + // } if (store.getters.token && !config.clearToken) { config.headers.Authorization = `Bearer ${store.getters.token}` }