From 0bdbb3fce49bb4e8266a9e5cb4cf6a903e88223d Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 08 Apr 2026 19:43:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/axios.js | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/applications/drone-command/src/axios.js b/applications/drone-command/src/axios.js
index 1e7423d..037cee8 100644
--- a/applications/drone-command/src/axios.js
+++ b/applications/drone-command/src/axios.js
@@ -9,7 +9,7 @@
import axios from 'axios'
import store from '@/store/'
import router from '@/router/'
-import { serialize } from '@/utils/util'
+import { logOutFun, serialize } from '@/utils/util'
import { getToken, removeToken, removeRefreshToken } from '@/utils/auth'
import { isURL, validatenull } from '@/utils/validate'
import { ElMessage } from 'element-plus'
@@ -29,6 +29,7 @@
}
//跨域请求，允许保存cookie
axios.defaults.withCredentials = true
+
//http request拦截
axios.interceptors.request.use(
@@ -105,11 +106,7 @@
const currentRouteName = router.currentRoute.value.name
// 如果当前路由不是登录页，则跳转到登录页
if (currentRouteName !== '登录页') {
- store.dispatch('FedLogOut').then(() =>
- router.push({
- path: '/login',
- })
- )
+ logOutFun()
}
return Promise.reject(new Error(message))
}
@@ -150,10 +147,7 @@
removeRefreshToken()
const env = import.meta.env.VITE_APP_ENV
// 重定向到登录页
- store.dispatch('FedLogOut').then(() => router.push({
- path: '/login'
- }))
-
+ logOutFun()
return Promise.reject(new Error(message))
})
}
@@ -171,10 +165,7 @@
removeToken()
removeRefreshToken()
// 重定向到登录页
- store.dispatch('FedLogOut').then(() => router.push({
- path: '/login'
- }))
-
+ logOutFun()
return Promise.reject(new Error(message))
}
// 如果请求为oauth2错误码则首次报错时提示
--
Gitblit v1.9.3