From ffe81c64f543023f6d62bc6fdb91fe81a82110ce Mon Sep 17 00:00:00 2001
From: kazusa <409053122@qq.com>
Date: Fri, 29 Aug 2025 11:01:21 +0800
Subject: [PATCH] opt

---
 admin-frontend/src/router/index.ts  | 16 +++++++++++-----
 admin-frontend/src/stores/user.ts   | 29 +++++++++++++++++++++--------
 admin-frontend/src/utils/request.ts | 27 +++++++++++++++++++++++----
 3 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/admin-frontend/src/router/index.ts b/admin-frontend/src/router/index.ts
index 37dd2ac..1e1abe8 100644
--- a/admin-frontend/src/router/index.ts
+++ b/admin-frontend/src/router/index.ts
@@ -84,13 +84,19 @@ const router = createRouter({
 router.beforeEach(async (to, from, next) => {
   const userStore = useUserStore()
   
-  if (to.meta.requiresAuth && !userStore.token) {
+  // 如果要访问需要认证的页面，但没有token
+  if (to.meta.requiresAuth && !userStore.getToken()) {
     next('/login')
-  } else if (to.path === '/login' && userStore.token) {
-    next('/')
-  } else {
-    next()
+    return
   }
+  
+  // 如果已经登录，访问登录页，重定向到首页
+  if (to.path === '/login' && userStore.getToken()) {
+    next('/')
+    return
+  }
+  
+  next()
 })
 
 // 路由后置守卫 - 添加标签页
diff --git a/admin-frontend/src/stores/user.ts b/admin-frontend/src/stores/user.ts
index b8a6a17..4192c28 100644
--- a/admin-frontend/src/stores/user.ts
+++ b/admin-frontend/src/stores/user.ts
@@ -176,9 +176,13 @@ export const useUserStore = defineStore('user', () => {
   // 登出
   const logout = async () => {
     try {
-      await authApi.logout()
+      // 只有在有token的情况下才调用logout接口
+      if (token.value) {
+        await authApi.logout()
+      }
     } catch (error) {
-      console.error('登出失败:', error)
+      console.error('登出接口调用失败:', error)
+      // 即使接口调用失败，也要清除本地数据
     } finally {
       // 清除所有存储的数据
       removeToken()
@@ -221,12 +225,21 @@ export const useUserStore = defineStore('user', () => {
   if (token.value && !userInfo.value) {
     // 先尝试从缓存加载
     if (!loadCachedUserInfo()) {
-      // 缓存无效，从服务器获取
-      getUserInfo().catch(() => {
-        // 如果获取用户信息失败，清除无效token
-        removeToken()
-        clearUserCache()
-      })
+      // 缓存无效，延迟从服务器获取，避免在应用初始化时立即发送请求
+      setTimeout(() => {
+        if (token.value && !userInfo.value) {
+          getUserInfo().catch((error) => {
+            console.error('获取用户信息失败:', error)
+            // 如果获取用户信息失败，清除无效token
+            removeToken()
+            clearUserCache()
+            // 如果当前不在登录页，跳转到登录页
+            if (router.currentRoute.value.path !== '/login') {
+              router.push('/login')
+            }
+          })
+        }
+      }, 100)
     }
   }
 
diff --git a/admin-frontend/src/utils/request.ts b/admin-frontend/src/utils/request.ts
index b7c8970..8146e76 100644
--- a/admin-frontend/src/utils/request.ts
+++ b/admin-frontend/src/utils/request.ts
@@ -29,6 +29,9 @@ request.interceptors.request.use(
   }
 )
 
+// 防止循环调用logout的标记
+let isLoggingOut = false
+
 // 响应拦截器
 request.interceptors.response.use(
   (response: AxiosResponse) => {
@@ -44,16 +47,32 @@ request.interceptors.response.use(
     return Promise.reject(res)
   },
   (error) => {
-    const { response } = error
+    const { response, config } = error
     
     if (response) {
       const { status, data } = response
       
       switch (status) {
         case 401:
-          ElMessage.error('认证失败，请重新登录')
-          useUserStore().logout()
-          router.push('/login')
+          // 如果是logout请求本身失败，或者已经在登出过程中，直接跳转登录页
+          if (config?.url?.includes('/auth/logout') || isLoggingOut) {
+            console.log('logout请求失败或正在登出中，直接跳转登录页')
+            isLoggingOut = false
+            const userStore = useUserStore()
+            userStore.removeToken()
+            userStore.clearUserCache()
+            router.push('/login')
+            return Promise.reject(error)
+          }
+          
+          // 防止重复登出
+          if (!isLoggingOut) {
+            isLoggingOut = true
+            ElMessage.error('认证失败，请重新登录')
+            useUserStore().logout().finally(() => {
+              isLoggingOut = false
+            })
+          }
           break
         case 403:
           ElMessage.error('权限不足')