Merge remote-tracking branch 'origin/test' into test

src/utils/request.js

@@ -15,8 +15,8 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 
 // 创建axios实例
 const service = axios.create({
-    baseURL: import.meta.env.VITE_APP_BASE_API || '/api', // 使用环境变量
-    timeout: 10000
+  baseURL: import.meta.env.VITE_APP_BASE_API || '/api', // 使用环境变量
+  timeout: 10000
 })
 
 // request拦截器
@@ -108,7 +108,7 @@ service.interceptors.response.use(
             useUserStore()
               .logOut()
               .then(() => {
-                location.href = '/index'
+                location.href = '/login?redirect=/workbench'
               })
           })
           .catch(() => {
@@ -132,13 +132,37 @@ service.interceptors.response.use(
   error => {
     console.log('err' + error)
     let { message } = error
+
     if (message == 'Network Error') {
       message = '后端接口连接异常'
     } else if (message.includes('timeout')) {
       message = '系统接口请求超时'
+    } else if (message == 'Request failed with status code 401') {
+      if (!isRelogin.show) {
+        isRelogin.show = true
+        ElMessageBox.confirm('登录状态已过期，请重新登录', '系统提示', {
+          confirmButtonText: '重新登录',
+          cancelButtonText: '取消',
+          type: 'warning',
+          showCancelButton: false
+        })
+          .then(() => {
+            isRelogin.show = false
+            useUserStore()
+              .logOut()
+              .then(() => {
+                location.href = '/login?redirect=/workbench'
+              })
+          })
+          .catch(() => {
+            isRelogin.show = false
+          })
+      }
+      return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
     } else if (message.includes('Request failed with status code')) {
       message = '系统接口' + message.substr(message.length - 3) + '异常'
     }
+
     ElMessage({ message: message, type: 'error', duration: 5 * 1000 })
     return Promise.reject(error)
   }