From e9d15feaa71495a76d39a3f0c8a804d4f864f814 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Tue, 13 Aug 2024 17:08:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.tsx                  |  2 +-
 src/utils/request/request.ts | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 905cb59..e8cd830 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -41,7 +41,7 @@ const App: React.FC = () => {
                     pwd: CryptoJS.MD5(loginInfo.password).toString(CryptoJS.enc.Hex)
                 }).then(res => {
                     if (res.code === 200) {
-                        toSrc('/home')
+                        storage.setItem('user', JSON.stringify(res.data))
                         startSignalr()
                     } else {
                         toSrc('/login')
diff --git a/src/utils/request/request.ts b/src/utils/request/request.ts
index 471587d..8dddd6b 100644
--- a/src/utils/request/request.ts
+++ b/src/utils/request/request.ts
@@ -20,7 +20,9 @@ class Request {
         const user = JSON.parse(storage.getItem('user') as string);
         if (user) {
           // 如果有token给请求头加上
-          req.headers.Authorization = `Bearer ${user.token}`
+          if (req.url.indexOf('auth/refresh?refreshToken=') === -1) {
+            req.headers.Authorization = `Bearer ${user.token}`
+          }
           req.timeout = constant.CONFIG_REQUEST_TIMEOUT_TIME
         }
         if (req.contentType) {
@@ -59,10 +61,8 @@ class Request {
           }
         }
         if (resData.code === 1403) {
-          setTimeout(() => {
-            storage.removeItem('user')
-            location.href = location.origin + '/#/login'
-          }, 3000)
+          storage.removeItem('user')
+          location.href = location.origin + '/#/login'
         }
         return resData
       },
@@ -70,15 +70,13 @@ class Request {
         function toLogin() {
           let user = JSON.parse(storage.getItem('user') as string);
           if (user) {
-            PostRefresh(user.refresh_token).then(res => {
+            PostRefresh(user.refresh_token).then((res) => {
               if (res.code == 200) {
                 storage.setItem('user', JSON.stringify(res.data))
                 location.reload()
               } else {
-                setTimeout(() => {
-                  storage.removeItem('user')
-                  location.href = location.origin + '/#/login'
-                }, 3000)
+                storage.removeItem('user')
+                location.href = location.origin + '/#/login'
               }
             })
           } else {