diff --git a/src/layouts/default/header/components/user-dropdown/index.vue b/src/layouts/default/header/components/user-dropdown/index.vue index d25d34b1dfcf48192a155e3db61a9d947a4d9ffb..31a127491aa655d892b5d7a2d2992c3095e0e199 100644 --- a/src/layouts/default/header/components/user-dropdown/index.vue +++ b/src/layouts/default/header/components/user-dropdown/index.vue @@ -76,7 +76,7 @@ const { getShowDoc, getUseLockPage } = useHeaderSetting(); const userStore = useUserStore(); const getUserInfo = computed(() => { - console.log('------------', userStore.getUserInfo); + // console.log('------------', userStore.getUserInfo); const { userName: realName = '', avatar, desc } = userStore.getUserInfo || {}; return { realName, avatar: avatar || headerImg, desc }; }); diff --git a/src/router/guard/permissionGuard.ts b/src/router/guard/permissionGuard.ts index 4d3941427889600deb02713da2cb491fc34804bf..b49959448b783d7f9e4867557f2be6adcda720ab 100644 --- a/src/router/guard/permissionGuard.ts +++ b/src/router/guard/permissionGuard.ts @@ -8,6 +8,8 @@ import { useUserStoreWithOut } from '/@/store/modules/user'; import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic'; import { RootRoute } from '/@/router/routes'; +import { getAuthCache } from '/@/utils/auth'; +import { USER_INFO_KEY } from '/@/enums/cacheEnum'; const LOGIN_PATH = PageEnum.BASE_LOGIN; @@ -83,7 +85,7 @@ export function createPermissionGuard(router: Router) { // get userinfo while last fetch time is empty if (userStore.getLastUpdateTime === 0) { try { - await userStore.getUserInfoAction(); + await userStore.getUserInfoAction(getAuthCache(USER_INFO_KEY)); } catch (err) { next(); return; diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index a16c1afd6117119ac141e2d4a2d538a7f1e6fb86..e6a34e8ae0e464ce59cf8f67d5ef4d0519546716 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -7,7 +7,7 @@ import { PageEnum } from '/@/enums/pageEnum'; import { ROLES_KEY, TOKEN_KEY, USER_INFO_KEY, TMALLAB_TOKEN_KEY } from '/@/enums/cacheEnum'; import { getAuthCache, setAuthCache } from '/@/utils/auth'; import { GetUserInfoModel, LoginParams } from '/@/api/sys/model/userModel'; -import { doLogout, getUserInfo, loginApi, tmallabLoginApi } from '/@/api/sys/user'; +import { loginApi, tmallabLoginApi } from '/@/api/sys/user'; import { useI18n } from '/@/hooks/web/useI18n'; import { useMessage } from '/@/hooks/web/useMessage'; import { router } from '/@/router'; @@ -174,14 +174,15 @@ export const useUserStore = defineStore({ * @description: logout */ async logout(goLogin = false) { - if (this.getToken) { - try { - await doLogout(); - } catch { - console.log('注销Token失败'); - } - } + // if (this.getToken) { + // try { + // await doLogout(); + // } catch { + // console.log('注销Token失败'); + // } + // } this.setToken(undefined); + this.setTmallabToken(undefined); this.setSessionTimeout(false); this.setUserInfo({}); goLogin && router.push(PageEnum.BASE_LOGIN);