From 9b4692b625b97ecfa2e25262e826721114df51b7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 27 十一月 2023 10:59:00 +0800
Subject: [PATCH] !59 响应加密功能 Merge pull request !59 from MichelleChung/dev
---
.env.development | 2 ++
src/utils/jsencrypt.ts | 2 +-
src/utils/request.ts | 21 ++++++++++++++++++---
src/types/env.d.ts | 1 +
src/utils/crypto.ts | 21 +++++++++++++++++++++
.env.production | 2 ++
6 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/.env.development b/.env.development
index 53750c9..7edd98a 100644
--- a/.env.development
+++ b/.env.development
@@ -20,6 +20,8 @@
# 鎺ュ彛鍔犲瘑浼犺緭 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='
# 瀹㈡埛绔痠d
VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e'
diff --git a/.env.production b/.env.production
index c463542..0e3b9fc 100644
--- a/.env.production
+++ b/.env.production
@@ -23,6 +23,8 @@
# 鎺ュ彛鍔犲瘑浼犺緭 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='
# 瀹㈡埛绔痠d
VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e'
diff --git a/src/types/env.d.ts b/src/types/env.d.ts
index 15fa03a..9560307 100644
--- a/src/types/env.d.ts
+++ b/src/types/env.d.ts
@@ -68,6 +68,7 @@
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 133893e..8217146 100644
--- a/src/utils/crypto.ts
+++ b/src/utils/crypto.ts
@@ -31,6 +31,13 @@
};
/**
+ * 瑙ｅ瘑base64
+ */
+export const decryptBase64 = (str: string) => {
+ return CryptoJS.enc.Base64.parse(str);
+};
+
+/**
* 浣跨敤瀵嗛挜瀵规暟鎹繘琛屽姞瀵�
* @param message
* @param aesKey
@@ -43,3 +50,17 @@
});
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 98114b4..42de5a0 100644
--- a/src/utils/jsencrypt.ts
+++ b/src/utils/jsencrypt.ts
@@ -4,7 +4,7 @@
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 ed67713..a183ca6 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -8,9 +8,10 @@
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 @@
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.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;
// 鑾峰彇閿欒淇℃伅
--
Gitblit v1.9.3