Merge remote-tracking branch 'origin/master'

chenyao

2026-04-08 0bdbb3fce49bb4e8266a9e5cb4cf6a903e88223d

 applications/task-work-order/src/store/modules/user.js

@@ -1,7 +1,7 @@
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 } from '@/utils/util'
import { deepClone, logOutFun } from '@/utils/util'
import defaultAva from '@/assets/images/defaultava.png'
import {
   loginByUsername,
@@ -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,26 +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()
         })
      },
      GetTopMenu() {
@@ -259,13 +247,7 @@
      },
      GetMenu({ commit, dispatch }, tenantId) {
         const errLogOut = () => {
            dispatch('LogOut').then(() => {
               const env = import.meta.env.VITE_APP_ENV
               const adminUrl = import.meta.env.VITE_APP_DASHBOARD_URL
               env === 'development'
                  ? (window.location.href = '/task-work-order/login')
                  : window.location.replace(`${adminUrl}#/login`)
            })
            logOutFun()
         }
         return new Promise(resolve => {
            getRoutes({ tenantId, sysType: 6 })