吉安感知网项目-前端
罗广辉
2026-04-01 efb197d037a83c9af9bab07b08f85acf5e91f531
feat: 退出登录调整
3 files modified
29 ■■■■ changed files
applications/drone-command/src/store/modules/user.js 5 ●●●●● patch | view | raw | blame | history
applications/task-work-order/src/axiosXT.js 2 ●●● patch | view | raw | blame | history
applications/task-work-order/src/store/modules/user.js 22 ●●●● patch | view | raw | blame | history
applications/drone-command/src/store/modules/user.js
@@ -3,6 +3,7 @@
  setRefreshToken,
  removeToken,
  removeRefreshToken,
    getToken,
  getRefreshToken,
} from '@/utils/auth'
import { setStore, getStore } from '@/utils/store'
@@ -229,8 +230,8 @@
    // 登出
    LogOut ({ commit }) {
      return new Promise((resolve, reject) => {
        logout()
          .then(() => {
                const promiseRes = getToken() ? logout() : Promise.resolve()
                promiseRes.then(() => {
            commit('SET_TOKEN', '')
            commit('SET_MENU_ALL_NULL', [])
            commit('SET_MENU', [])
applications/task-work-order/src/axiosXT.js
@@ -17,7 +17,7 @@
})
function logOutFun () {
    store.dispatch('FedLogOut').then(() => {
    store.dispatch('LogOut').then(() => {
        const { VITE_APP_PARENT_SYSTEM, VITE_APP_ENV } = import.meta.env
        const isDev = VITE_APP_ENV === 'development'
applications/task-work-order/src/store/modules/user.js
@@ -1,4 +1,4 @@
import { setToken, setRefreshToken, removeToken, removeRefreshToken, getRefreshToken } from '@/utils/auth'
import { setToken, setRefreshToken, removeToken, removeRefreshToken, getRefreshToken, getToken } from '@/utils/auth'
import { setStore, getStore } from '@/utils/store'
import { validatenull } from '@/utils/validate'
import { deepClone, logOutFun } from '@/utils/util'
@@ -217,7 +217,8 @@
        // 登出
        LogOut({ commit }) {
            return new Promise((resolve, reject) => {
                logout()
                const promiseRes = getToken() ? logout() : Promise.resolve()
                promiseRes
                    .then(() => {
                        commit('SET_TOKEN', '')
                        commit('SET_MENU_ALL_NULL', [])
@@ -227,28 +228,13 @@
                        commit('CLEAR_LOCK')
                        removeToken()
                        removeRefreshToken()
                        removeToken()
                        resolve()
                        localStorage.clear()
                    })
                    .catch(error => {
                        reject(error)
                    })
            })
        },
        //注销session
        FedLogOut({ commit }) {
            return new Promise(resolve => {
                commit('SET_TOKEN', '')
                commit('SET_MENU_ALL_NULL', [])
                commit('SET_MENU', [])
                commit('SET_ROLES', [])
                commit('DEL_ALL_TAG', [])
                commit('CLEAR_LOCK')
                removeToken()
                removeRefreshToken()
                removeToken()
                resolve()
                localStorage.clear()
            })
        },
        GetTopMenu() {