From 8bd514fa2913d318b8f2b1fd38df0fa13e35f320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com>
Date: Thu, 9 Nov 2023 18:32:51 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20:recycle:=20=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E5=92=8C=E7=99=BB=E5=87=BA?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E4=BC=9A=E8=AF=9D=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 4486879b3beb4d26b7a41cffd4e0b4b022e1943d
---
 src/api/user/index.ts     |  2 +-
 src/layout/index.vue      |  3 +--
 src/permission.ts         |  4 ++--
 src/store/modules/user.ts | 27 +++++++++++++++------------
 src/utils/request.ts      |  6 ++++--
 5 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/api/user/index.ts b/src/api/user/index.ts
index d6d8141..3c7087a 100644
--- a/src/api/user/index.ts
+++ b/src/api/user/index.ts
@@ -5,7 +5,7 @@ import { UserForm, UserInfo, UserPageVO, UserQuery } from "./types";
 /**
  * 登录成功后获取用户信息（昵称、头像、权限集合和角色集合）
  */
-export function getUserInfo(): AxiosPromise<UserInfo> {
+export function getUserInfoApi(): AxiosPromise<UserInfo> {
   return request({
     url: "/api/v1/users/me",
     method: "get",
diff --git a/src/layout/index.vue b/src/layout/index.vue
index dccd012..975edf3 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -88,8 +88,6 @@ function toggleSideBar() {
     <Sidebar class="sidebar-container" />
     <template v-if="layout === 'mix'">
       <div class="mix-wrap">
-        <!-- :menu-list="mixLeftMenu -->
-        <!-- :menu-list="permissionStore.routes -->
         <div class="left-wrap">
           <LeftMenu :menu-list="mixLeftMenu" :base-path="activeTopMenu" />
           <div class="menu-action">
@@ -155,6 +153,7 @@ function toggleSideBar() {
   .main-container {
     padding-top: 50px;
     margin-left: 0;
+    overflow: hidden;
   }
 
   // 顶部模式全局变量修改
diff --git a/src/permission.ts b/src/permission.ts
index 8512cb8..29db962 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -32,7 +32,7 @@ router.beforeEach(async (to, from, next) => {
         }
       } else {
         try {
-          const { roles } = await userStore.getInfo();
+          const { roles } = await userStore.getUserInfo();
           const accessRoutes = await permissionStore.generateRoutes(roles);
           accessRoutes.forEach((route) => {
             router.addRoute(route);
@@ -40,7 +40,7 @@ router.beforeEach(async (to, from, next) => {
           next({ ...to, replace: true });
         } catch (error) {
           // 移除 token 并跳转登录页
-          await userStore.resetStore();
+          await userStore.resetToken();
           next(`/login?redirect=${to.path}`);
           NProgress.done();
         }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index d328487..c9558e1 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -1,7 +1,7 @@
 import { defineStore } from "pinia";
 
 import { loginApi, logoutApi } from "@/api/auth";
-import { getUserInfo } from "@/api/user";
+import { getUserInfoApi } from "@/api/user";
 import { resetRouter } from "@/router";
 import { store } from "@/store";
 
@@ -39,9 +39,9 @@ export const useUserStore = defineStore("user", () => {
   }
 
   // 获取信息(用户昵称、头像、角色集合、权限集合)
-  function getInfo() {
+  function getUserInfo() {
     return new Promise<UserInfo>((resolve, reject) => {
-      getUserInfo()
+      getUserInfoApi()
         .then(({ data }) => {
           if (!data) {
             reject("Verification failed, please Login again.");
@@ -60,12 +60,12 @@ export const useUserStore = defineStore("user", () => {
     });
   }
 
-  // 注销
+  // user logout
   function logout() {
     return new Promise<void>((resolve, reject) => {
       logoutApi()
         .then(() => {
-          resetStore();
+          token.value = "";
           location.reload(); // 清空路由
           resolve();
         })
@@ -75,19 +75,22 @@ export const useUserStore = defineStore("user", () => {
     });
   }
 
-  /** 清空缓存 */
-  function resetStore() {
-    resetRouter();
-    token.value = "";
-    Object.assign(user, { roles: [], perms: [] });
+  // remove token
+  function resetToken() {
+    return new Promise<void>((resolve) => {
+      token.value = "";
+      resetRouter();
+      resolve();
+    });
   }
+
   return {
     token,
     user,
     login,
-    getInfo,
+    getUserInfo,
     logout,
-    resetStore,
+    resetToken,
   };
 });
 
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 8cc6393..d527751 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -46,8 +46,10 @@ service.interceptors.response.use(
           confirmButtonText: "确定",
           type: "warning",
         }).then(() => {
-          localStorage.clear();
-          window.location.href = "/";
+          const userStore = useUserStoreHook();
+          userStore.resetToken().then(() => {
+            location.reload();
+          });
         });
       } else {
         ElMessage.error(msg || "系统出错");