From b95a49c7d74e5c7f45cd7c65f45502edf7f203dd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 07 二月 2025 13:08:34 +0800
Subject: [PATCH] reset 回滚有问题的修改

---
 src/utils/request.ts |  302 +++++++++++++++++++++++++++++---------------------
 1 files changed, 175 insertions(+), 127 deletions(-)

diff --git a/src/utils/request.ts b/src/utils/request.ts
index 1376fbd..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,153 +7,201 @@
 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,
-	timeout: 50000
+  baseURL: import.meta.env.VITE_APP_BASE_API,
+  timeout: 50000
 });
 
 // 璇锋眰鎷︽埅鍣�
 service.interceptors.request.use(
-	(config: InternalAxiosRequestConfig) => {
-		const isToken = (config.headers || {}).isToken === false;
-		// 鏄惁闇�瑕侀槻姝㈡暟鎹噸澶嶆彁浜�
-		const isRepeatSubmit = !(config.headers || {}).repeatSubmit;
-		if (getToken() && !isToken) {
-			config.headers['Authorization'] = 'Bearer ' + getToken(); // 璁╂瘡涓姹傛惡甯﹁嚜瀹氫箟token 璇锋牴鎹疄闄呮儏鍐佃嚜琛屼慨鏀�
-		}
-		// get璇锋眰鏄犲皠params鍙傛暟
-		if (config.method === 'get' && config.params) {
-			let url = config.url + '?' + tansParams(config.params);
-			url = url.slice(0, -1);
-			config.params = {};
-			config.url = url;
-		}
+  (config: InternalAxiosRequestConfig) => {
+    // 瀵瑰簲鍥介檯鍖栬祫婧愭枃浠跺悗缂�
+    config.headers['Content-Language'] = getLanguage();
 
-		if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
-			const requestObj = {
-				url: config.url,
-				data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
-				time: new Date().getTime()
-			};
-			const sessionObj = cache.session.getJSON('sessionObj');
-			if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
-				cache.session.setJSON('sessionObj', requestObj);
-			} else {
-				const s_url = sessionObj.url; // 璇锋眰鍦板潃
-				const s_data = sessionObj.data; // 璇锋眰鏁版嵁
-				const s_time = sessionObj.time; // 璇锋眰鏃堕棿
-				const interval = 500; // 闂撮殧鏃堕棿(ms)锛屽皬浜庢鏃堕棿瑙嗕负閲嶅鎻愪氦
-				if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
-					const message = '鏁版嵁姝e湪澶勭悊锛岃鍕块噸澶嶆彁浜�';
-					console.warn(`[${s_url}]: ` + message);
-					return Promise.reject(new Error(message));
-				} else {
-					cache.session.setJSON('sessionObj', requestObj);
-				}
-			}
-		}
-		return config;
-	},
-	(error: any) => {
-		console.log(error);
-		return Promise.reject(error);
-	}
+    const isToken = config.headers?.isToken === false;
+    // 鏄惁闇�瑕侀槻姝㈡暟鎹噸澶嶆彁浜�
+    const isRepeatSubmit = config.headers?.repeatSubmit === false;
+    // 鏄惁闇�瑕佸姞瀵�
+    const isEncrypt = config.headers?.isEncrypt === 'true';
+
+    if (getToken() && !isToken) {
+      config.headers['Authorization'] = 'Bearer ' + getToken(); // 璁╂瘡涓姹傛惡甯﹁嚜瀹氫箟token 璇锋牴鎹疄闄呮儏鍐佃嚜琛屼慨鏀�
+    }
+    // get璇锋眰鏄犲皠params鍙傛暟
+    if (config.method === 'get' && config.params) {
+      let url = config.url + '?' + tansParams(config.params);
+      url = url.slice(0, -1);
+      config.params = {};
+      config.url = url;
+    }
+
+    if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
+      const requestObj = {
+        url: config.url,
+        data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
+        time: new Date().getTime()
+      };
+      const sessionObj = cache.session.getJSON('sessionObj');
+      if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
+        cache.session.setJSON('sessionObj', requestObj);
+      } else {
+        const s_url = sessionObj.url; // 璇锋眰鍦板潃
+        const s_data = sessionObj.data; // 璇锋眰鏁版嵁
+        const s_time = sessionObj.time; // 璇锋眰鏃堕棿
+        const interval = 500; // 闂撮殧鏃堕棿(ms)锛屽皬浜庢鏃堕棿瑙嗕负閲嶅鎻愪氦
+        if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
+          const message = '鏁版嵁姝e湪澶勭悊锛岃鍕块噸澶嶆彁浜�';
+          console.warn(`[${s_url}]: ` + message);
+          return Promise.reject(new Error(message));
+        } else {
+          cache.session.setJSON('sessionObj', requestObj);
+        }
+      }
+    }
+    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) => {
+    return Promise.reject(error);
+  }
 );
 
 // 鍝嶅簲鎷︽埅鍣�
 service.interceptors.response.use(
-	(res) => {
-		// 鏈缃姸鎬佺爜鍒欓粯璁ゆ垚鍔熺姸鎬�
-		const code = res.data.code || HttpStatus.SUCCESS;
-		// 鑾峰彇閿欒淇℃伅
-		const msg = errorCode[code] || res.data.msg || errorCode['default'];
-		// 浜岃繘鍒舵暟鎹垯鐩存帴杩斿洖
-		if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
-			return res.data;
-		}
-		if (code === 401) {
-			// prettier-ignore
-			if (!isRelogin.show) {
-				isRelogin.show = true;
-				ElMessageBox.confirm('鐧诲綍鐘舵�佸凡杩囨湡锛屾偍鍙互缁х画鐣欏湪璇ラ〉闈紝鎴栬�呴噸鏂扮櫥褰�', '绯荤粺鎻愮ず', {
-					confirmButtonText: '閲嶆柊鐧诲綍',
-					cancelButtonText: '鍙栨秷',
-					type: 'warning'
-				}).then(() => {
-					isRelogin.show = false;
-					useUserStore().logout().then(() => {
-							location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
-						});
-				}).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) {
-			ElMessage({ message: msg, type: 'warning' });
-			return Promise.reject(new Error(msg));
-		} else if (code !== HttpStatus.SUCCESS) {
-			ElNotification.error({ title: msg });
-			return Promise.reject('error');
-		} else {
-			return Promise.resolve(res.data);
-		}
-	},
-	(error) => {
-		let { message } = error;
-		if (message == 'Network Error') {
-			message = '鍚庣鎺ュ彛杩炴帴寮傚父';
-		} else if (message.includes('timeout')) {
-			message = '绯荤粺鎺ュ彛璇锋眰瓒呮椂';
-		} else if (message.includes('Request failed with status code')) {
-			message = '绯荤粺鎺ュ彛' + message.substr(message.length - 3) + '寮傚父';
-		}
-		ElMessage({ message: message, type: 'error', duration: 5 * 1000 });
-		return Promise.reject(error);
-	}
+  (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 瑙e瘑
+        const base64Str = decrypt(keyStr);
+        // base64 瑙g爜 寰楀埌璇锋眰澶寸殑 AES 绉橀挜
+        const aesKey = decryptBase64(base64Str.toString());
+        // aesKey 瑙g爜 data
+        const decryptData = decryptWithAes(data, aesKey);
+        // 灏嗙粨鏋� (寰楀埌鐨勬槸 JSON 瀛楃涓�) 杞负 JSON
+        res.data = JSON.parse(decryptData);
+      }
+    }
+    // 鏈缃姸鎬佺爜鍒欓粯璁ゆ垚鍔熺姸鎬�
+    const code = res.data.code || HttpStatus.SUCCESS;
+    // 鑾峰彇閿欒淇℃伅
+    const msg = errorCode[code] || res.data.msg || errorCode['default'];
+    // 浜岃繘鍒舵暟鎹垯鐩存帴杩斿洖
+    if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
+      return res.data;
+    }
+    if (code === 401) {
+      // prettier-ignore
+      if (!isRelogin.show) {
+        isRelogin.show = true;
+        ElMessageBox.confirm('鐧诲綍鐘舵�佸凡杩囨湡锛屾偍鍙互缁х画鐣欏湪璇ラ〉闈紝鎴栬�呴噸鏂扮櫥褰�', '绯荤粺鎻愮ず', {
+          confirmButtonText: '閲嶆柊鐧诲綍',
+          cancelButtonText: '鍙栨秷',
+          type: 'warning'
+        }).then(() => {
+          isRelogin.show = false;
+          useUserStore().logout().then(() => {
+            router.replace({
+              path: '/login',
+              query: {
+                redirect: encodeURIComponent(router.currentRoute.value.fullPath || '/')
+              }
+            })
+          });
+        }).catch(() => {
+          isRelogin.show = false;
+        });
+      }
+      return Promise.reject('鏃犳晥鐨勪細璇濓紝鎴栬�呬細璇濆凡杩囨湡锛岃閲嶆柊鐧诲綍銆�');
+    } else if (code === HttpStatus.SERVER_ERROR) {
+      ElMessage({ message: msg, type: 'error' });
+      return Promise.reject(new Error(msg));
+    } else if (code === HttpStatus.WARN) {
+      ElMessage({ message: msg, type: 'warning' });
+      return Promise.reject(new Error(msg));
+    } else if (code !== HttpStatus.SUCCESS) {
+      ElNotification.error({ title: msg });
+      return Promise.reject('error');
+    } else {
+      return Promise.resolve(res.data);
+    }
+  },
+  (error: any) => {
+    let { message } = error;
+    if (message == 'Network Error') {
+      message = '鍚庣鎺ュ彛杩炴帴寮傚父';
+    } else if (message.includes('timeout')) {
+      message = '绯荤粺鎺ュ彛璇锋眰瓒呮椂';
+    } else if (message.includes('Request failed with status code')) {
+      message = '绯荤粺鎺ュ彛' + message.substr(message.length - 3) + '寮傚父';
+    }
+    ElMessage({ message: message, type: 'error', duration: 5 * 1000 });
+    return Promise.reject(error);
+  }
 );
 // 閫氱敤涓嬭浇鏂规硶
 export function download(url: string, params: any, fileName: string) {
-	downloadLoadingInstance = ElLoading.service({ text: '姝e湪涓嬭浇鏁版嵁锛岃绋嶅��', background: 'rgba(0, 0, 0, 0.7)' });
-	// prettier-ignore
-	return service.post(url, params, {
-			transformRequest: [
-				(params) => {
-					return tansParams(params);
-				}
-			],
-			headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-			responseType: 'blob'
-		}).then(async (resp) => {
-			const isLogin = blobValidate(resp);
-			if (isLogin) {
-				const blob = new Blob([resp as any]);
+  downloadLoadingInstance = ElLoading.service({ text: '姝e湪涓嬭浇鏁版嵁锛岃绋嶅��', background: 'rgba(0, 0, 0, 0.7)' });
+  // prettier-ignore
+  return service.post(url, params, {
+      transformRequest: [
+        (params: any) => {
+          return tansParams(params);
+        }
+      ],
+      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      responseType: 'blob'
+    }).then(async (resp: any) => {
+      const isLogin = blobValidate(resp);
+      if (isLogin) {
+        const blob = new Blob([resp]);
         FileSaver.saveAs(blob, fileName);
-			} else {
-				const resText = await resp.data.text();
-				const rspObj = JSON.parse(resText);
-				const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default'];
-				ElMessage.error(errMsg);
-			}
-			downloadLoadingInstance.close();
-		}).catch((r) => {
-			console.error(r);
-			ElMessage.error('涓嬭浇鏂囦欢鍑虹幇閿欒锛岃鑱旂郴绠$悊鍛橈紒');
-			downloadLoadingInstance.close();
-		});
+      } else {
+        const resText = await resp.data.text();
+        const rspObj = JSON.parse(resText);
+        const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default'];
+        ElMessage.error(errMsg);
+      }
+      downloadLoadingInstance.close();
+    }).catch((r: any) => {
+      console.error(r);
+      ElMessage.error('涓嬭浇鏂囦欢鍑虹幇閿欒锛岃鑱旂郴绠$悊鍛橈紒');
+      downloadLoadingInstance.close();
+    });
 }
 // 瀵煎嚭 axios 瀹炰緥
 export default service;

--
Gitblit v1.9.3