From 5f7bcaa1c20cab0c6d499045e37373283da8b3d9 Mon Sep 17 00:00:00 2001
From: heduo <hd15193034224@163.com>
Date: Sun, 31 Mar 2024 19:15:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(hd)=EF=BC=9A=E5=A4=84=E7=90=86=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=B7=AF=E7=94=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../header/components/user-dropdown/index.vue   |  2 +-
 src/router/guard/permissionGuard.ts             |  4 +++-
 src/store/modules/user.ts                       | 17 +++++++++--------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/layouts/default/header/components/user-dropdown/index.vue b/src/layouts/default/header/components/user-dropdown/index.vue
index d25d34b..31a1274 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 4d39414..b499594 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 a16c1af..e6a34e8 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);
-- 
2.24.1