From bc4d7e0dc178b7d2faa4b226fcc5a2361f65083b Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sat, 4 Nov 2023 00:13:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8E=E5=AE=9A=E6=97=B6=E5=99=A8=E4=BE=9D?=
 =?UTF-8?q?=E7=84=B6=E6=89=A7=E8=A1=8C=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 continew-admin-ui/src/components/navbar/index.vue |  5 +++--
 continew-admin-ui/src/store/modules/user/index.ts |  3 ++-
 continew-admin-ui/src/utils/auth.ts               | 12 +++++++++++-
 continew-admin-ui/src/utils/request.ts            |  4 ++--
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/continew-admin-ui/src/components/navbar/index.vue b/continew-admin-ui/src/components/navbar/index.vue
index f3fa8974..945aa3fa 100644
--- a/continew-admin-ui/src/components/navbar/index.vue
+++ b/continew-admin-ui/src/components/navbar/index.vue
@@ -190,7 +190,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { computed, ref, inject, watchEffect } from 'vue';
+  import { computed, ref, inject } from 'vue';
   import { useDark, useToggle, useFullscreen } from '@vueuse/core';
   import { useAppStore, useUserStore } from '@/store';
   import { countUnread } from '@/api/system/message';
@@ -200,6 +200,7 @@
   import Menu from '@/components/menu/index.vue';
   import getAvatar from '@/utils/avatar';
   import getFile from '@/utils/file';
+  import { setTimer } from '@/utils/auth';
   import MessageBox from '../message-box/index.vue';
 
   const appStore = useAppStore();
@@ -234,7 +235,7 @@
     unReadMessageCount.value = res.data.total;
   }
   getUnreadCount();
-  setInterval(getUnreadCount, 10000);
+  setTimer(setInterval(getUnreadCount, 10000));
 
   const handleToggleTheme = () => {
     toggleTheme();
diff --git a/continew-admin-ui/src/store/modules/user/index.ts b/continew-admin-ui/src/store/modules/user/index.ts
index 4f4e247a..4ab25d3f 100644
--- a/continew-admin-ui/src/store/modules/user/index.ts
+++ b/continew-admin-ui/src/store/modules/user/index.ts
@@ -11,7 +11,7 @@ import {
   getUserInfo,
 } from '@/api/auth';
 import { getImageCaptcha as getCaptcha } from '@/api/common/captcha';
-import { setToken, clearToken } from '@/utils/auth';
+import { setToken, clearToken, clearTimer } from '@/utils/auth';
 import { removeRouteListener } from '@/utils/route-listener';
 import { UserState } from './types';
 import useAppStore from '../app';
@@ -102,6 +102,7 @@ const useUserStore = defineStore('user', {
       const appStore = useAppStore();
       this.resetInfo();
       clearToken();
+      clearTimer();
       removeRouteListener();
       appStore.clearServerMenu();
     },
diff --git a/continew-admin-ui/src/utils/auth.ts b/continew-admin-ui/src/utils/auth.ts
index 1a87c0ad..394b5b60 100644
--- a/continew-admin-ui/src/utils/auth.ts
+++ b/continew-admin-ui/src/utils/auth.ts
@@ -1,3 +1,4 @@
+const TIMER_KEY = 'timer';
 const TOKEN_KEY = 'token';
 
 const isLogin = () => {
@@ -16,4 +17,13 @@ const clearToken = () => {
   localStorage.removeItem(TOKEN_KEY);
 };
 
-export { isLogin, getToken, setToken, clearToken };
+const setTimer = (timer: number) => {
+  localStorage.setItem(TIMER_KEY, String(timer));
+};
+
+const clearTimer = () => {
+  clearInterval(Number(localStorage.getItem(TIMER_KEY)));
+  localStorage.removeItem(TIMER_KEY);
+};
+
+export { isLogin, getToken, setToken, clearToken, setTimer, clearTimer };
diff --git a/continew-admin-ui/src/utils/request.ts b/continew-admin-ui/src/utils/request.ts
index 8dcc2d00..fdf0b6ea 100644
--- a/continew-admin-ui/src/utils/request.ts
+++ b/continew-admin-ui/src/utils/request.ts
@@ -51,6 +51,8 @@ axios.interceptors.response.use(
       return res;
     }
     if ([401].includes(res.code) && response.config.url !== '/auth/user/info') {
+      const userStore = useUserStore();
+      userStore.logout();
       modalErrorWrapper({
         title: '确认退出',
         content: res.msg,
@@ -58,8 +60,6 @@ axios.interceptors.response.use(
         escToClose: false,
         okText: '重新登录',
         async onOk() {
-          const userStore = useUserStore();
-          await userStore.logout();
           window.location.reload();
         },
       });