fix session timeout

src/plugins/axiosApp.ts

@@ -12,6 +12,10 @@ import { useMainStore } from "@/store";
 
 let store = null as unknown as ReturnType<typeof useMainStore>;
 
+setTimeout(() => {
+  store = useMainStore();
+}, 0);
+
 const config = {
   // baseURL: process.env.baseURL || process.env.apiUrl || ""
   timeout: 1 * 60 * 1000, // Timeout
@@ -37,9 +41,6 @@ function gToken(
 
 _axiosApp.interceptors.request.use(
   function (config) {
-    if (!store) {
-      store = useMainStore();
-    }
     if (config.setGlobalMask) {
       store.globalMask = true;
     }
@@ -98,8 +99,10 @@ _axiosApp.interceptors.response.use(
 
     // 登录失效 跳转登录页面
     if (status == 403 || status == 401) {
-      notifyInvalidTokenThrottled();
-      removeToken();
+      if (error.config.url !== "/api/ess/auth/logout") {
+        notifyInvalidTokenThrottled();
+        removeToken();
+      }
       return Promise.reject(error);
     } else if (status == 405) {
       if (showErrorMessage) {

src/plugins/axiosNotice.ts

@@ -2,8 +2,7 @@ import Vue from "vue";
 import { throttle } from "lodash-es";
 import { message } from "ant-design-vue";
 import { logout } from "@/api/loginPage";
-import { routeLogout } from "@/router";
-import { useRoute } from "vue-router";
+import router, { routeLogout } from "@/router";
 
 export const notifyInvalidTokenThrottled = throttle(() => {
   message.error({
@@ -11,9 +10,11 @@ export const notifyInvalidTokenThrottled = throttle(() => {
     duration: 10,
   });
   setTimeout(() => {
-    const route = useRoute();
-    logout().then(() =>
-      routeLogout({ cause: "主动退出", redirectTo: route.fullPath })
+    logout().finally(() =>
+      routeLogout({
+        cause: "登录失效",
+        redirectTo: router.currentRoute.value.fullPath,
+      })
     );
   }, 3000);
   console.log("登录失效");