From abc15e3b848526b502d6abe4b88c82fd757b1a24 Mon Sep 17 00:00:00 2001
From: engigu <sayheya@qq.com>
Date: Sat, 20 Sep 2025 15:57:05 +0800
Subject: [PATCH] fix: cookie expire redirect

---
 web/src/api/api.js      | 42 +++++++++++++++++++++++++++++------------
 web/src/router/index.js | 11 +++++++----
 2 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/web/src/api/api.js b/web/src/api/api.js
index f139df5..5fd9deb 100644
--- a/web/src/api/api.js
+++ b/web/src/api/api.js
@@ -1,6 +1,6 @@
 // request.js
 import axios from 'axios';
-import { useRouter } from 'vue-router';
+import router from '../router';
 
 import { usePageState } from '../store/page_sate';
 import { CONSTANT } from '../constant';
@@ -41,24 +41,41 @@ request.interceptors.request.use(
 // 响应拦截器
 request.interceptors.response.use(
     (response) => {
-
+        // 检查业务逻辑错误
         if (response && response.data.code != 200) {
+            // 检查是否是token相关的错误码
+            const tokenErrorCodes = [20001, 20002, 20003, 20004, 20005];
+            if (tokenErrorCodes.includes(response.data.code)) {
+                // Token失效，执行登出
+                logout();
+                return Promise.reject(response);
+            }
+            
+            // 其他业务错误显示toast
             toast.error(response.data.msg, {
                 description: '接口逻辑错误'
-            })
-            // Promise.reject();
+            });
         }
         return response;
     },
     (error) => {
-
+        // HTTP状态码401表示未授权
         if (error.response && error.response.status == 401) {
-            logout();
-        } else if (error.response && 20000 <= error.response.status && error.response.status <= 29999) {
+            // 检查响应体中的业务错误码
+            if (error.response.data && error.response.data.code) {
+                const tokenErrorCodes = [20001, 20002, 20003, 20004, 20005];
+                if (tokenErrorCodes.includes(error.response.data.code)) {
+                    logout();
+                    return Promise.reject(error);
+                }
+            }
+            
+            // 其他401错误也执行登出
             logout();
         } else {
             handleException(error);
         }
+        return Promise.reject(error);
     }
 );
 
@@ -80,13 +97,14 @@ const handleException = (error) => {
 
 // 登出系统
 const logout = () => {
-    const router = useRouter();
     const pageState = usePageState();
-    pageState.setIsLogin(false);
+    
+    // 清除token和登录状态
+    pageState.setToken('');
     localStorage.removeItem(CONSTANT.STORE_TOKEN_NAME);
-    setTimeout(() => {
-        router.push('/login');
-    }, 500);
+    
+    // 立即跳转到登录页
+    router.push('/login');
 };
 
 export { request, handleException, logout };
diff --git a/web/src/router/index.js b/web/src/router/index.js
index d6dc931..66f18c6 100644
--- a/web/src/router/index.js
+++ b/web/src/router/index.js
@@ -83,13 +83,16 @@ router.beforeEach((to, from, next) => {
     return;
   }
   
+  // 如果没有token且不是访问登录页，跳转到登录页
   if (!isAuthenticated && to.path !== '/login') {
-
     next('/login');
-  } else if (isAuthenticated && to.path === '/login') {
-
+  } 
+  // 如果有token且访问登录页，跳转到首页
+  else if (isAuthenticated && to.path === '/login') {
     next('/');
-  } else {
+  } 
+  // 其他情况正常访问
+  else {
     next();
   }
 });