From b3c1b95437d2edd914cb4e0c62c55737d7e61657 Mon Sep 17 00:00:00 2001 From: "Michelle.Chung" <1242874891@qq.com> Date: Mon, 20 Nov 2023 19:27:03 +0800 Subject: [PATCH 1/9] =?UTF-8?q?add=20=E6=96=B0=E5=A2=9E=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E8=A7=A3=E5=AF=86=E7=A7=81=E9=92=A5=20;=20add=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20crypto#decryptBase64=20Base64=E8=A7=A3=E7=A0=81?= =?UTF-8?q?=E6=96=B9=E6=B3=95=20;=20update=20=E6=9B=B4=E6=96=B0=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E6=8B=A6=E6=88=AA=E5=99=A8=E5=A2=9E=E5=8A=A0=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E8=A7=A3=E5=AF=86=E9=80=BB=E8=BE=91=20;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 ++ .env.production | 2 ++ src/types/env.d.ts | 1 + src/utils/crypto.ts | 21 +++++++++++++++++++++ src/utils/jsencrypt.ts | 2 +- src/utils/request.ts | 21 ++++++++++++++++++--- 6 files changed, 45 insertions(+), 4 deletions(-) diff --git a/.env.development b/.env.development index b2b28c8b..53ae057f 100644 --- a/.env.development +++ b/.env.development @@ -20,6 +20,8 @@ VITE_APP_PORT = 80 # 接口加密传输 RSA 公钥与后端解密私钥对应 如更换需前后端一同更换 VITE_APP_RSA_PUBLIC_KEY = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==' +# 接口响应解密 RSA 私钥与后端加密公钥对应 如更换需前后端一同更换 +VITE_APP_RSA_PRIVATE_KEY = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3CuPiGL/LcIIm7zryCEIbl1SPzBkr75E2VMtxegyZ1lYRD+7TZGAPkvIsBcaMs6Nsy0L78n2qh+lIZMpLH8wIDAQABAkEAk82Mhz0tlv6IVCyIcw/s3f0E+WLmtPFyR9/WtV3Y5aaejUkU60JpX4m5xNR2VaqOLTZAYjW8Wy0aXr3zYIhhQQIhAMfqR9oFdYw1J9SsNc+CrhugAvKTi0+BF6VoL6psWhvbAiEAxPPNTmrkmrXwdm/pQQu3UOQmc2vCZ5tiKpW10CgJi8kCIFGkL6utxw93Ncj4exE/gPLvKcT+1Emnoox+O9kRXss5AiAMtYLJDaLEzPrAWcZeeSgSIzbL+ecokmFKSDDcRske6QIgSMkHedwND1olF8vlKsJUGK3BcdtM8w4Xq7BpSBwsloE=' # 客户端id VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e' diff --git a/.env.production b/.env.production index c4635427..0e3b9fc5 100644 --- a/.env.production +++ b/.env.production @@ -23,6 +23,8 @@ VITE_APP_PORT = 80 # 接口加密传输 RSA 公钥与后端解密私钥对应 如更换需前后端一同更换 VITE_APP_RSA_PUBLIC_KEY = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==' +# 接口响应解密 RSA 私钥与后端加密公钥对应 如更换需前后端一同更换 +VITE_APP_RSA_PRIVATE_KEY = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3CuPiGL/LcIIm7zryCEIbl1SPzBkr75E2VMtxegyZ1lYRD+7TZGAPkvIsBcaMs6Nsy0L78n2qh+lIZMpLH8wIDAQABAkEAk82Mhz0tlv6IVCyIcw/s3f0E+WLmtPFyR9/WtV3Y5aaejUkU60JpX4m5xNR2VaqOLTZAYjW8Wy0aXr3zYIhhQQIhAMfqR9oFdYw1J9SsNc+CrhugAvKTi0+BF6VoL6psWhvbAiEAxPPNTmrkmrXwdm/pQQu3UOQmc2vCZ5tiKpW10CgJi8kCIFGkL6utxw93Ncj4exE/gPLvKcT+1Emnoox+O9kRXss5AiAMtYLJDaLEzPrAWcZeeSgSIzbL+ecokmFKSDDcRske6QIgSMkHedwND1olF8vlKsJUGK3BcdtM8w4Xq7BpSBwsloE=' # 客户端id VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e' diff --git a/src/types/env.d.ts b/src/types/env.d.ts index 15fa03a6..9560307a 100644 --- a/src/types/env.d.ts +++ b/src/types/env.d.ts @@ -68,6 +68,7 @@ interface ImportMetaEnv { VITE_APP_POWERJOB_ADMIN: string; VITE_APP_ENV: string; VITE_APP_RSA_PUBLIC_KEY: string; + VITE_APP_RSA_PRIVATE_KEY: string; VITE_APP_CLIENT_ID: string; VITE_APP_WEBSOCKET: string; } diff --git a/src/utils/crypto.ts b/src/utils/crypto.ts index 133893ea..8217146b 100644 --- a/src/utils/crypto.ts +++ b/src/utils/crypto.ts @@ -30,6 +30,13 @@ export const encryptBase64 = (str: CryptoJS.lib.WordArray) => { return CryptoJS.enc.Base64.stringify(str); }; +/** + * 解密base64 + */ +export const decryptBase64 = (str: string) => { + return CryptoJS.enc.Base64.parse(str); +}; + /** * 使用密钥对数据进行加密 * @param message @@ -43,3 +50,17 @@ export const encryptWithAes = (message: string, aesKey: CryptoJS.lib.WordArray) }); return encrypted.toString(); }; + +/** + * 使用密钥对数据进行解密 + * @param message + * @param aesKey + * @returns {string} + */ +export const decryptWithAes = (message: string, aesKey: CryptoJS.lib.WordArray) => { + const decrypted = CryptoJS.AES.decrypt(message, aesKey, { + mode: CryptoJS.mode.ECB, + padding: CryptoJS.pad.Pkcs7 + }); + return decrypted.toString(CryptoJS.enc.Utf8); +}; diff --git a/src/utils/jsencrypt.ts b/src/utils/jsencrypt.ts index 98114b43..42de5a01 100644 --- a/src/utils/jsencrypt.ts +++ b/src/utils/jsencrypt.ts @@ -4,7 +4,7 @@ import JSEncrypt from 'jsencrypt'; const publicKey = import.meta.env.VITE_APP_RSA_PUBLIC_KEY; // 前端不建议存放私钥 不建议解密数据 因为都是透明的意义不大 -const privateKey = '**********'; +const privateKey = import.meta.env.VITE_APP_RSA_PRIVATE_KEY; // 加密 export const encrypt = (txt: string) => { diff --git a/src/utils/request.ts b/src/utils/request.ts index ed677139..a183ca63 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -8,9 +8,10 @@ import { errorCode } from '@/utils/errorCode'; import { LoadingInstance } from 'element-plus/es/components/loading/src/loading'; import FileSaver from 'file-saver'; import { getLanguage } from '@/lang'; -import { encryptBase64, encryptWithAes, generateAesKey } from '@/utils/crypto'; -import { encrypt } from '@/utils/jsencrypt'; +import { encryptBase64, encryptWithAes, generateAesKey, decryptWithAes, decryptBase64 } from '@/utils/crypto'; +import { encrypt, decrypt } from '@/utils/jsencrypt'; +const encryptHeader = 'encrypt-key'; let downloadLoadingInstance: LoadingInstance; // 是否显示重新登录 export const isRelogin = { show: false }; @@ -78,7 +79,7 @@ service.interceptors.request.use( if (isEncrypt && (config.method === 'post' || config.method === 'put')) { // 生成一个 AES 密钥 const aesKey = generateAesKey(); - config.headers['encrypt-key'] = encrypt(encryptBase64(aesKey)); + config.headers[encryptHeader] = encrypt(encryptBase64(aesKey)); config.data = typeof config.data === 'object' ? encryptWithAes(JSON.stringify(config.data), aesKey) : encryptWithAes(config.data, aesKey); } // FormData数据去请求头Content-Type @@ -96,6 +97,20 @@ service.interceptors.request.use( // 响应拦截器 service.interceptors.response.use( (res: AxiosResponse) => { + // 加密后的 AES 秘钥 + const keyStr = res.headers[encryptHeader]; + // 加密 + if (keyStr != null && keyStr != '') { + const data = res.data; + // 请求体 AES 解密 + const base64Str = decrypt(keyStr); + // base64 解码 得到请求头的 AES 秘钥 + const aesKey = decryptBase64(base64Str.toString()); + // aesKey 解码 data + const decryptData = decryptWithAes(data, aesKey); + // 将结果 (得到的是 JSON 字符串) 转为 JSON + res.data = JSON.parse(decryptData); + } // 未设置状态码则默认成功状态 const code = res.data.code || HttpStatus.SUCCESS; // 获取错误信息 -- Gitee From 25e2e0e018a00adbfedcee5377d5d0349bb6eb54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Thu, 23 Nov 2023 16:50:31 +0800 Subject: [PATCH 2/9] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=85=B3=E4=BA=8E=E6=9D=83=E9=99=90=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E7=AC=A6=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/menu/index.vue | 2 +- src/views/system/role/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index e8898761..06cd928f 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -169,7 +169,7 @@