From 736f1c27cd5c5f04a2285dbf45c562f6acb40e34 Mon Sep 17 00:00:00 2001
From: xiaoxian521 <1923740402@qq.com>
Date: Sun, 10 Apr 2022 21:22:05 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=90=8C=E6=AD=A5=E5=AE=8C=E6=95=B4?=
 =?UTF-8?q?=E7=89=88=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/user.ts                                 | 23 -----------------------
 src/layout/components/navbar.vue             |  4 ++--
 src/layout/components/sidebar/horizontal.vue |  4 ++--
 src/layout/components/sidebar/mixNav.vue     |  4 ++--
 src/layout/hooks/nav.ts                      |  8 ++++----
 src/store/modules/permission.ts              |  5 +----
 src/store/modules/user.ts                    | 10 +++++-----
 src/views/login.vue                          | 20 ++++++--------------
 8 files changed, 22 insertions(+), 56 deletions(-)
 delete mode 100644 mock/user.ts

diff --git a/mock/user.ts b/mock/user.ts
deleted file mode 100644
index 34389c0..0000000
--- a/mock/user.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { MockMethod } from "vite-plugin-mock";
-
-export default [
-  {
-    url: "/login",
-    method: "post",
-    response: ({ body }) => {
-      if (body.username === "admin") {
-        return {
-          username: "admin",
-          expires: 24 * 60 * 60,
-          accessToken: "eyJhbGciOiJIUzUxMiJ9.admin"
-        };
-      } else {
-        return {
-          username: "test",
-          expires: 24 * 60 * 60,
-          accessToken: "eyJhbGciOiJIUzUxMiJ9.test"
-        };
-      }
-    }
-  }
-] as MockMethod[];
diff --git a/src/layout/components/navbar.vue b/src/layout/components/navbar.vue
index 156b9b4..d6e0057 100644
--- a/src/layout/components/navbar.vue
+++ b/src/layout/components/navbar.vue
@@ -23,7 +23,7 @@ const {
   changeTitle,
   toggleSideBar,
   pureApp,
-  usename,
+  username,
   getDropdownItemStyle
 } = useNav();
 
@@ -94,7 +94,7 @@ function translationEn() {
       <el-dropdown trigger="click">
         <span class="el-dropdown-link">
           <img :src="avatars" />
-          <p>{{ usename }}</p>
+          <p>{{ username }}</p>
         </span>
         <template #dropdown>
           <el-dropdown-menu class="logout">
diff --git a/src/layout/components/sidebar/horizontal.vue b/src/layout/components/sidebar/horizontal.vue
index d2a414c..e38091d 100644
--- a/src/layout/components/sidebar/horizontal.vue
+++ b/src/layout/components/sidebar/horizontal.vue
@@ -29,7 +29,7 @@ const {
   changeTitle,
   handleResize,
   menuSelect,
-  usename,
+  username,
   getDropdownItemStyle
 } = useNav();
 
@@ -115,7 +115,7 @@ function translationEn() {
       <el-dropdown trigger="click">
         <span class="el-dropdown-link">
           <img :src="avatars" />
-          <p>{{ usename }}</p>
+          <p>{{ username }}</p>
         </span>
         <template #dropdown>
           <el-dropdown-menu class="logout">
diff --git a/src/layout/components/sidebar/mixNav.vue b/src/layout/components/sidebar/mixNav.vue
index 7308bba..1ffe83c 100644
--- a/src/layout/components/sidebar/mixNav.vue
+++ b/src/layout/components/sidebar/mixNav.vue
@@ -32,7 +32,7 @@ const {
   menuSelect,
   resolvePath,
   pureApp,
-  usename,
+  username,
   getDropdownItemStyle
 } = useNav();
 
@@ -167,7 +167,7 @@ function translationEn() {
       <el-dropdown trigger="click">
         <span class="el-dropdown-link">
           <img :src="avatars" />
-          <p>{{ usename }}</p>
+          <p>{{ username }}</p>
         </span>
         <template #dropdown>
           <el-dropdown-menu class="logout">
diff --git a/src/layout/hooks/nav.ts b/src/layout/hooks/nav.ts
index e5e224e..1dcb48b 100644
--- a/src/layout/hooks/nav.ts
+++ b/src/layout/hooks/nav.ts
@@ -7,13 +7,12 @@ import { remainingPaths } from "/@/router";
 import { transformI18n } from "/@/plugins/i18n";
 import { storageSession } from "/@/utils/storage";
 import { useAppStoreHook } from "/@/store/modules/app";
-import { useUserStoreHook } from "/@/store/modules/user";
 import { useEpThemeStoreHook } from "/@/store/modules/epTheme";
 
 export function useNav() {
   const pureApp = useAppStoreHook();
   // 用户名
-  const usename: string = storageSession.getItem("info")?.username;
+  const username: string = storageSession.getItem("info")?.username;
 
   // 设置国际化选中后的样式
   const getDropdownItemStyle = computed(() => {
@@ -39,7 +38,8 @@ export function useNav() {
 
   // 退出登录
   function logout() {
-    useUserStoreHook().logOut();
+    storageSession.removeItem("info");
+    router.push("/login");
   }
 
   function backHome() {
@@ -112,7 +112,7 @@ export function useNav() {
     resolvePath,
     isCollapse,
     pureApp,
-    usename,
+    username,
     getDropdownItemStyle
   };
 }
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index a2d84cf..f2aa691 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -61,11 +61,8 @@ export const usePermissionStore = defineStore({
           break;
       }
     },
-    // 清空缓存
+    // 清空缓存页面
     clearAllCachePage() {
-      this.wholeMenus = [];
-      this.menusTree = [];
-      this.buttonAuth = [];
       this.cachePageList = [];
     }
   }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index d744f3e..9f04254 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -33,12 +33,12 @@ export const useUserStore = defineStore({
     },
     // 登入
     async loginByUsername(data) {
-      return new Promise((resolve, reject) => {
+      return new Promise<void>((resolve, reject) => {
         getLogin(data)
-          .then(res => {
-            if (res) {
-              setToken(res);
-              resolve(res);
+          .then(data => {
+            if (data) {
+              setToken(data);
+              resolve();
             }
           })
           .catch(error => {
diff --git a/src/views/login.vue b/src/views/login.vue
index d1120e3..7054a0f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -8,26 +8,18 @@ import bg from "/@/assets/login/bg.png";
 import avatar from "/@/assets/login/avatar.svg?component";
 import illustration from "/@/assets/login/illustration.svg?component";
 
-import { useUserStoreHook } from "/@/store/modules/user";
-import { usePermissionStoreHook } from "/@/store/modules/permission";
-
 const router = useRouter();
 
 let user = ref("admin");
 let pwd = ref("123456");
 
 const onLogin = (): void => {
-  useUserStoreHook()
-    .loginByUsername({ username: user.value, password: pwd.value })
-    .then(async (res: any) => {
-      storageSession.setItem("info", {
-        username: res.username,
-        accessToken: res.accessToken
-      });
-      usePermissionStoreHook().clearAllCachePage();
-      initRouter(res.username);
-      router.push("/");
-    });
+  storageSession.setItem("info", {
+    username: "admin",
+    accessToken: "eyJhbGciOiJIUzUxMiJ9.test"
+  });
+  initRouter("admin").then(() => {});
+  router.push("/");
 };
 
 function onUserFocus() {