From c75027743ea7c3ecc2d0885f01d11d2ad78679a3 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 23 十月 2026 14:23:26 +0800
Subject: [PATCH] Merge branch 'yxh' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/utils/request.js | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index 93e7229..0755ac6 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,6 +3,8 @@
import store from '@/store'
import { getToken } from '@/utils/auth'
import errorCode from '@/utils/errorCode'
+import cache from '@/plugins/cache'
+
axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
// 鍒涘缓axios瀹炰緥
@@ -15,7 +17,10 @@
// request鎷︽埅鍣�
service.interceptors.request.use(config => {
// 鏄惁闇�瑕佽缃� token
- const isToken = (config.headers || {}).isToken === false
+ // const isToken = (config.headers || {}).isToken === false
+ const isToken = false;
+ const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
+
if (getToken() && !isToken) {
config.headers['Authorization'] = 'Bearer ' + getToken() // 璁╂瘡涓姹傛惡甯﹁嚜瀹氫箟token 璇锋牴鎹疄闄呮儏鍐佃嚜琛屼慨鏀�
}
@@ -43,6 +48,29 @@
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)
+ }
+ }
+ }
return config
}, error => {
console.log(error)
@@ -67,18 +95,7 @@
location.href = '/index';
})
}).catch(() => {});
- return Promise.reject('鏃犳晥鐨勪細璇濓紝鎴栬�呬細璇濆凡杩囨湡锛岃閲嶆柊鐧诲綍銆�')
- } else if (code === 500) {
- Message({
- message: msg,
- type: 'error'
- })
- return Promise.reject(new Error(msg))
- } else if (code !== 200) {
- Notification.error({
- title: msg
- })
- return Promise.reject('error')
+ return Promise.reject('鏃犳晥鐨勪細璇濓紝鎴栬�呬細璇濆凡杩囨湡锛岃閲嶆柊鐧诲綍1銆�')
} else {
return res.data
}
@@ -93,8 +110,13 @@
message = "绯荤粺鎺ュ彛璇锋眰瓒呮椂";
}
else if (message.includes("Request failed with status code")) {
- message = "绯荤粺鎺ュ彛" + message.substr(message.length - 3) + "寮傚父";
+ // 浼樺厛灞曠ず鍚庣杩斿洖鐨勫叿浣撳師鍥狅紙濡�"鍖婚櫌鍗忓弸绯荤粺鎺ユ敹澶辫触锛屾湰娆″鎵规湭鐢熸晥锛岃绋嶅悗閲嶆柊瀹℃壒"锛�
+ const data = error.response && error.response.data;
+ const backendMsg = data && (data.msg || data.message);
+ message = backendMsg || ("绯荤粺鎺ュ彛" + message.substr(message.length - 3) + "寮傚父");
}
+ // 2026-10-09 鎭㈠閿欒鎻愮ず锛氬師鏉ヨ繖閲屾槸娉ㄩ噴鐘舵�侊紝瀵艰嚧璇锋眰鍙戠敓 HTTP 绾ч敊璇椂
+ // 椤甸潰浠�涔堥兘涓嶆彁绀猴紙璋冪敤鏂圭殑 .then 涓嶄細鎵ц锛夛紝鐢ㄦ埛鐪嬩笉鍒板け璐ュ師鍥�
Message({
message: message,
type: 'error',
--
Gitblit v1.9.3