From 3c60793b29ce70369871db801bfbfa26cb1fa212 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 09 Feb 2026 16:52:23 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/axios.js | 20 ++++++----
applications/drone-command/src/store/modules/user.js | 1
applications/task-work-order/src/store/modules/user.js | 2 +
applications/task-work-order/src/axios.js | 35 ++++++-----------
applications/task-work-order/src/permission.js | 11 +++--
applications/drone-command/src/permission.js | 10 +++-
6 files changed, 42 insertions(+), 37 deletions(-)
diff --git a/applications/drone-command/src/axios.js b/applications/drone-command/src/axios.js
index 1e7423d..25102b1 100644
--- a/applications/drone-command/src/axios.js
+++ b/applications/drone-command/src/axios.js
@@ -30,6 +30,16 @@
//跨域请求，允许保存cookie
axios.defaults.withCredentials = true
+function logOutFun() {
+ store.dispatch('FedLogOut').then(() =>{
+ const {VITE_APP_PARENT_SYSTEM,VITE_APP_ENV} = import.meta.env
+ const isDev = VITE_APP_ENV === 'development'
+ isDev
+ ? router.push({ path: '/login' })
+ : window.location.replace(`${VITE_APP_PARENT_SYSTEM}/#/login`)
+ })
+}
+
//http request拦截
axios.interceptors.request.use(
config => {
@@ -150,10 +160,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 +178,7 @@
removeToken()
removeRefreshToken()
// 重定向到登录页
- store.dispatch('FedLogOut').then(() => router.push({
- path: '/login'
- }))
-
+ logOutFun()
return Promise.reject(new Error(message))
}
// 如果请求为oauth2错误码则首次报错时提示
diff --git a/applications/drone-command/src/permission.js b/applications/drone-command/src/permission.js
index d6471a8..6e17a22 100644
--- a/applications/drone-command/src/permission.js
+++ b/applications/drone-command/src/permission.js
@@ -91,9 +91,13 @@
} else {
const systemToken = store.getters.token || urlParams?.token
if (systemToken === 0) {
- store.dispatch('FedLogOut').then(() => {
- next({ path: '/login' })
- })
+ store.dispatch('FedLogOut').then(() =>{
+ const {VITE_APP_PARENT_SYSTEM,VITE_APP_ENV} = import.meta.env
+ const isDev = VITE_APP_ENV === 'development'
+ isDev
+ ? router.push({ path: '/login' })
+ : window.location.replace(`${VITE_APP_PARENT_SYSTEM}/#/login`)
+ })
} else {
const meta = to.meta || {}
const query = to.query || {}
diff --git a/applications/drone-command/src/store/modules/user.js b/applications/drone-command/src/store/modules/user.js
index e02ca65..0a71fbc 100644
--- a/applications/drone-command/src/store/modules/user.js
+++ b/applications/drone-command/src/store/modules/user.js
@@ -260,6 +260,7 @@
removeRefreshToken()
removeToken()
resolve()
+ localStorage.clear()
})
},
GetTopMenu () {
diff --git a/applications/task-work-order/src/axios.js b/applications/task-work-order/src/axios.js
index 1a6e862..d40e9b3 100644
--- a/applications/task-work-order/src/axios.js
+++ b/applications/task-work-order/src/axios.js
@@ -17,7 +17,6 @@
import { Base64 } from 'js-base64'
import { baseUrl } from '@/config/env'
import crypto from '@/utils/crypto'
-const adminUrl = import.meta.env.VITE_APP_DASHBOARD_URL
// 全局未授权错误提示状态，只提示一次
let isErrorShown = false
@@ -34,6 +33,17 @@
//跨域请求，允许保存cookie
withCredentials: true,
})
+
+function logOutFun() {
+ store.dispatch('FedLogOut').then(() =>{
+ const {VITE_APP_PARENT_SYSTEM,VITE_APP_ENV} = import.meta.env
+ const isDev = VITE_APP_ENV === 'development'
+ isDev
+ ? router.push({ path: '/login' })
+ : window.location.replace(`${VITE_APP_PARENT_SYSTEM}/#/login`)
+ })
+}
+
//http request拦截
service.interceptors.request.use(
@@ -153,16 +163,7 @@
removeRefreshToken()
const env = import.meta.env.VITE_APP_ENV
// 重定向到登录页
- store.dispatch('FedLogOut').then(() => router.push({
- path: '/login'
- }));
- // env === 'development'
- // ? store.dispatch('FedLogOut').then(() =>
- // router.push({
- // path: '/login',
- // })
- // )
- // : store.dispatch('FedLogOut').then(() => window.location.replace(`${adminUrl}#/login`))
+ logOutFun()
return Promise.reject(new Error(message))
})
}
@@ -180,17 +181,7 @@
removeToken()
removeRefreshToken()
// 重定向到登录页
- // store.dispatch('FedLogOut').then(() => router.push({
- // path: '/login'
- // }));
- const env = import.meta.env.VITE_APP_ENV
- env === 'development'
- ? store.dispatch('FedLogOut').then(() =>
- router.push({
- path: '/login',
- })
- )
- : store.dispatch('FedLogOut').then(() => window.location.replace(`${adminUrl}#/login`))
+ logOutFun()
return Promise.reject(new Error(message))
}
// 如果请求为oauth2错误码则首次报错时提示
diff --git a/applications/task-work-order/src/permission.js b/applications/task-work-order/src/permission.js
index 2b61a5e..b7c3b74 100644
--- a/applications/task-work-order/src/permission.js
+++ b/applications/task-work-order/src/permission.js
@@ -92,10 +92,13 @@
} else {
const systemToken = store.getters.token || urlParams?.token
if (systemToken === 0) {
- store.dispatch('FedLogOut').then(() => {
- next({ path: '/login' })
- })
- // store.dispatch('FedLogOut').then(() => window.location.replace(`${adminUrl}#/login`));
+ store.dispatch('FedLogOut').then(() =>{
+ const {VITE_APP_PARENT_SYSTEM,VITE_APP_ENV} = import.meta.env
+ const isDev = VITE_APP_ENV === 'development'
+ isDev
+ ? router.push({ path: '/login' })
+ : window.location.replace(`${VITE_APP_PARENT_SYSTEM}/#/login`)
+ })
} else {
const meta = to.meta || {}
const query = to.query || {}
diff --git a/applications/task-work-order/src/store/modules/user.js b/applications/task-work-order/src/store/modules/user.js
index ca9f16c..6c4c7a1 100644
--- a/applications/task-work-order/src/store/modules/user.js
+++ b/applications/task-work-order/src/store/modules/user.js
@@ -228,6 +228,7 @@
removeToken()
removeRefreshToken()
resolve()
+ localStorage.clear()
})
.catch(error => {
reject(error)
@@ -247,6 +248,7 @@
removeRefreshToken()
removeToken()
resolve()
+ localStorage.clear()
})
},
GetTopMenu() {
--
Gitblit v1.9.3