From 5f694550ed7bf0f6147c66feaa4406034ae62e54 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Tue, 11 Aug 2026 19:06:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/axiosXT.js | 28 +++++++---------------------
1 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/applications/task-work-order/src/axiosXT.js b/applications/task-work-order/src/axiosXT.js
index 174498a..679980f 100644
--- a/applications/task-work-order/src/axiosXT.js
+++ b/applications/task-work-order/src/axiosXT.js
@@ -1,7 +1,6 @@
import axios from 'axios'
import store from '@/store/'
-import router from '@/router/'
-import { serialize } from '@/utils/util'
+import { serialize, logOutFun } from '@/utils/util'
import { getToken, removeToken, removeRefreshToken } from '@/utils/auth'
import { ElMessage } from 'element-plus'
@@ -16,19 +15,6 @@
withCredentials: false,
})
-function logOutFun () {
- store.dispatch('FedLogOut').then(() => {
- const { VITE_APP_PARENT_SYSTEM, VITE_APP_ENV } = import.meta.env
- const isDev = VITE_APP_ENV === 'development'
-
- isErrorShown = false
- _retry = false
-
- isDev
- ? router.push({ path: '/login' })
- : window.location.replace(`${VITE_APP_PARENT_SYSTEM}/#/login`)
- })
-}
//http request拦截
serviceXT.interceptors.request.use(
@@ -61,21 +47,21 @@
const message = res?.data?.msg || res?.data?.message || '系统错误'
// 如果是401并且已经重试过，直接跳转到登录页面
- if ((status === 500 || status === 401) && !_retry) {
+ if ((status === 401) && !_retry) {
_retry = true
// 首次报错时提示
if (!isErrorShown) {
isErrorShown = true
- ElMessage({
- message: '用户令牌过期，请重新登录',
- type: 'error',
- })
+ ElMessage.error('用户令牌过期，请重新登录')
}
// 清除token信息
removeToken()
removeRefreshToken()
// 重定向到登录页
- logOutFun()
+ logOutFun().then(() => {
+ isErrorShown = false
+ _retry = false
+ })
return Promise.reject(new Error(message))
}
--
Gitblit v1.9.3