From b8e09a7ab8d7a2765e4a55c23a7a57ce09c29b3f Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期五, 26 八月 2022 13:36:34 +0800
Subject: [PATCH] Default Changelist

---
 src/utils/request.ts |   39 +++++++++++++++++++++++----------------
 1 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/utils/request.ts b/src/utils/request.ts
index 4abb65d..fe82a55 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,7 +1,9 @@
 import axios from 'axios';
 import { ElMessage, ElMessageBox } from 'element-plus';
-import { Session } from '/@/utils/storage';
 import JSONbig from 'json-bigint';
+import Cookies from 'js-cookie';
+import { useLoginApi } from '/@/api/login';
+import { Session } from '/@/utils/storage';
 
 // var jsonBig = require('json-bigint')({ "storeAsString": true });
 // 配置新建一个 axios 实例
@@ -18,9 +20,9 @@
                 config.data[key] = null;
             }
         }
-        if (Session.get('token')) {
-            (<any>config.headers).common['Authorization'] = `${Session.get('token')}`;
-            (<any>config.headers).common['uid'] = `${Session.get('uid')}`;
+        if (Cookies.get('token')) {
+            (<any>config.headers).common['Authorization'] = `${Cookies.get('token')}`;
+            (<any>config.headers).common['uid'] = `${Cookies.get('uid')}`;
         }
         return config;
     },
@@ -50,16 +52,21 @@
         // 对响应数据做点什么
         if (response.data.code && response.data.code === 'A0213') {
             ElMessage.error('用户uid不存在');
-            setTimeout(() => {
-                Session.clear();
-                window.location.href = '/';
-            }, 1000);
+            useLoginApi()
+                .signOut()
+                .then(() => {
+                    Session.clear();
+                    window.location.href = '/';
+                });
         } else if (response.data.code && response.data.code === 'A0215') {
             ElMessage.error('token失效');
-            setTimeout(() => {
-                Session.clear();
-                window.location.href = '/';
-            }, 1000);
+            // logOut;
+            useLoginApi()
+                .signOut()
+                .then(() => {
+                    Session.clear();
+                    window.location.href = '/';
+                });
         }
         // if(response.data.code && response.data.code !== '200'){
         return Promise.resolve(response);
@@ -93,10 +100,10 @@
             }, 1000);
         } else if (error.message == 'Network Error') {
             ElMessage.error('网络连接错误');
-            // setTimeout(() => {
-            //     Session.clear();
-            //     window.location.href = '/';
-            // }, 1000);
+            setTimeout(() => {
+                Session.clear();
+                window.location.href = '/';
+            }, 1000);
         } else {
             if (error.response.data) ElMessage.error(error.response.data.error);
             else ElMessage.error('接口路径找不到');

--
Gitblit v1.9.2