From 5e440a7dc434c43eb828fa62cf9c12b0078b8565 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 一月 2025 11:36:18 +0800
Subject: [PATCH] !173 发布 5.3.0-BETA 公测版本 Merge pull request !173 from 疯狂的狮子Li/dev
---
src/utils/request.ts | 78 +++++++++++++++++++++++++++++++-------
1 files changed, 63 insertions(+), 15 deletions(-)
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 14c33f8..9682b81 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,4 +1,4 @@
-import axios, { InternalAxiosRequestConfig } from 'axios';
+import axios, { AxiosResponse, InternalAxiosRequestConfig } from 'axios';
import { useUserStore } from '@/store/modules/user';
import { getToken } from '@/utils/auth';
import { tansParams, blobValidate } from '@/utils/ruoyi';
@@ -7,14 +7,24 @@
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, decryptWithAes, decryptBase64 } from '@/utils/crypto';
+import { encrypt, decrypt } from '@/utils/jsencrypt';
+import router from '@/router';
+const encryptHeader = 'encrypt-key';
let downloadLoadingInstance: LoadingInstance;
// 鏄惁鏄剧ず閲嶆柊鐧诲綍
export const isRelogin = { show: false };
+export const globalHeaders = () => {
+ return {
+ Authorization: 'Bearer ' + getToken(),
+ clientid: import.meta.env.VITE_APP_CLIENT_ID
+ };
+};
axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8';
-// 瀵瑰簲鍥介檯鍖栬祫婧愭枃浠跺悗缂�
-axios.defaults.headers['Content-Language'] = 'zh_CN';
+axios.defaults.headers['clientid'] = import.meta.env.VITE_APP_CLIENT_ID;
// 鍒涘缓 axios 瀹炰緥
const service = axios.create({
baseURL: import.meta.env.VITE_APP_BASE_API,
@@ -24,9 +34,15 @@
// 璇锋眰鎷︽埅鍣�
service.interceptors.request.use(
(config: InternalAxiosRequestConfig) => {
- const isToken = (config.headers || {}).isToken === false;
+ // 瀵瑰簲鍥介檯鍖栬祫婧愭枃浠跺悗缂�
+ config.headers['Content-Language'] = getLanguage();
+
+ const isToken = config.headers?.isToken === false;
// 鏄惁闇�瑕侀槻姝㈡暟鎹噸澶嶆彁浜�
- const isRepeatSubmit = (config.headers || {}).repeatSubmit === false;
+ const isRepeatSubmit = config.headers?.repeatSubmit === false;
+ // 鏄惁闇�瑕佸姞瀵�
+ const isEncrypt = config.headers?.isEncrypt === 'true';
+
if (getToken() && !isToken) {
config.headers['Authorization'] = 'Bearer ' + getToken(); // 璁╂瘡涓姹傛惡甯﹁嚜瀹氫箟token 璇锋牴鎹疄闄呮儏鍐佃嚜琛屼慨鏀�
}
@@ -61,17 +77,45 @@
}
}
}
+ if (import.meta.env.VITE_APP_ENCRYPT === 'true') {
+ // 褰撳紑鍚弬鏁板姞瀵�
+ if (isEncrypt && (config.method === 'post' || config.method === 'put')) {
+ // 鐢熸垚涓�涓� AES 瀵嗛挜
+ const aesKey = generateAesKey();
+ 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
+ if (config.data instanceof FormData) {
+ delete config.headers['Content-Type'];
+ }
return config;
},
(error: any) => {
- console.log(error);
return Promise.reject(error);
}
);
// 鍝嶅簲鎷︽埅鍣�
service.interceptors.response.use(
- (res) => {
+ (res: AxiosResponse) => {
+ if (import.meta.env.VITE_APP_ENCRYPT === 'true') {
+ // 鍔犲瘑鍚庣殑 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;
// 鑾峰彇閿欒淇℃伅
@@ -91,15 +135,19 @@
}).then(() => {
isRelogin.show = false;
useUserStore().logout().then(() => {
- location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
- });
+ router.replace({
+ path: '/login',
+ query: {
+ redirect: encodeURIComponent(router.currentRoute.value.fullPath || '/')
+ }
+ })
+ });
}).catch(() => {
isRelogin.show = false;
});
}
return Promise.reject('鏃犳晥鐨勪細璇濓紝鎴栬�呬細璇濆凡杩囨湡锛岃閲嶆柊鐧诲綍銆�');
} else if (code === HttpStatus.SERVER_ERROR) {
- console.log(msg);
ElMessage({ message: msg, type: 'error' });
return Promise.reject(new Error(msg));
} else if (code === HttpStatus.WARN) {
@@ -112,7 +160,7 @@
return Promise.resolve(res.data);
}
},
- (error) => {
+ (error: any) => {
let { message } = error;
if (message == 'Network Error') {
message = '鍚庣鎺ュ彛杩炴帴寮傚父';
@@ -131,16 +179,16 @@
// prettier-ignore
return service.post(url, params, {
transformRequest: [
- (params) => {
+ (params: any) => {
return tansParams(params);
}
],
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
responseType: 'blob'
- }).then(async (resp) => {
+ }).then(async (resp: any) => {
const isLogin = blobValidate(resp);
if (isLogin) {
- const blob = new Blob([resp as any]);
+ const blob = new Blob([resp]);
FileSaver.saveAs(blob, fileName);
} else {
const resText = await resp.data.text();
@@ -149,7 +197,7 @@
ElMessage.error(errMsg);
}
downloadLoadingInstance.close();
- }).catch((r) => {
+ }).catch((r: any) => {
console.error(r);
ElMessage.error('涓嬭浇鏂囦欢鍑虹幇閿欒锛岃鑱旂郴绠＄悊鍛橈紒');
downloadLoadingInstance.close();
--
Gitblit v1.9.3