From 391eec3114a17e68652434c6eae610799d80290e Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 11:13:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/router/axios.js | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/router/axios.js b/Source/plt-web/plt-web-ui/src/router/axios.js
index 64b38fe..37a5615 100644
--- a/Source/plt-web/plt-web-ui/src/router/axios.js
+++ b/Source/plt-web/plt-web-ui/src/router/axios.js
@@ -17,7 +17,7 @@
import 'nprogress/nprogress.css';
//榛樿瓒呮椂鏃堕棿
-axios.defaults.timeout = 10000;
+axios.defaults.timeout = 30000;
//杩斿洖鍏朵粬鐘舵�佺爜
axios.defaults.validateStatus = function (status) {
return status >= 200 && status <= 500;
@@ -41,7 +41,7 @@
const meta = (config.meta || {});
const isToken = meta.isToken === false;
if (getToken() && !isToken) {
- config.headers[website.tokenHeader] = 'bearer ' + getToken()
+ config.headers[website.tokenHeader] = getToken()
}
//headers涓厤缃畉ext璇锋眰
if (config.text === true) {
@@ -66,7 +66,18 @@
//濡傛灉鍦ㄧ櫧鍚嶅崟閲屽垯鑷catch閫昏緫澶勭悊
if (statusWhiteList.includes(status)) return Promise.reject(res);
//濡傛灉鏄�401鍒欒烦杞埌鐧诲綍椤甸潰
- if (status === 401) store.dispatch('FedLogOut').then(() => router.push({path: '/login'}));
+ if (status === 401) {
+ store.dispatch('FedLogOut').then(() => router.push({path: '/login'}));
+ if(router.history.current.path!='/login'){
+ Message({
+ message: '浼氳瘽杩囨湡锛岃閲嶆柊鐧诲綍',
+ type: 'error'
+ });
+ return Promise.reject(new Error(message))
+ }else {
+ return Promise.reject()
+ }
+ }
// 濡傛灉璇锋眰涓洪潪200鍚﹁�呴粯璁ょ粺涓�澶勭悊
if (status !== 200) {
Message({
--
Gitblit v1.9.3