From a10b418ae95e4e8e0d584c4aa62d956a577e84a5 Mon Sep 17 00:00:00 2001
From: FatttSnake <fatttsnake@gmail.com>
Date: Tue, 10 Oct 2023 17:05:30 +0800
Subject: [PATCH] Optimize login

---
 src/pages/Login.tsx    | 78 ++++++++++++++++++++++--------------------
 src/services/index.tsx |  2 +-
 2 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx
index d0c4c5c..02ff4d2 100644
--- a/src/pages/Login.tsx
+++ b/src/pages/Login.tsx
@@ -16,43 +16,47 @@ const Login: React.FC = () => {
 
     const onFinish = (values: LoginForm) => {
         setIsLoggingIn(true)
-        void login(values.username, values.password).then((value) => {
-            const res = value.data
-            const { code, data } = res
-            switch (code) {
-                case SYSTEM_LOGIN_SUCCESS:
-                    setToken(data?.token ?? '')
-                    void messageApi.success('登录成功')
-                    setTimeout(() => {
-                        navigate('/')
-                    }, 1500)
-                    break
-                case SYSTEM_USERNAME_NOT_FOUND:
-                case SYSTEM_LOGIN_USERNAME_PASSWORD_ERROR:
-                    void messageApi.error(
-                        <>
-                            <strong>用户名</strong>或<strong>密码</strong>错误，请重试
-                        </>
-                    )
-                    setIsLoggingIn(false)
-                    break
-                case SYSTEM_USER_DISABLE:
-                    void messageApi.error(
-                        <>
-                            该用户已被<strong>禁用</strong>
-                        </>
-                    )
-                    setIsLoggingIn(false)
-                    break
-                default:
-                    void messageApi.error(
-                        <>
-                            <strong>服务器出错了</strong>
-                        </>
-                    )
-                    setIsLoggingIn(false)
-            }
-        })
+        void login(values.username, values.password)
+            .then((value) => {
+                const res = value.data
+                const { code, data } = res
+                switch (code) {
+                    case SYSTEM_LOGIN_SUCCESS:
+                        setToken(data?.token ?? '')
+                        void messageApi.success('登录成功')
+                        setTimeout(() => {
+                            navigate('/')
+                        }, 1500)
+                        break
+                    case SYSTEM_USERNAME_NOT_FOUND:
+                    case SYSTEM_LOGIN_USERNAME_PASSWORD_ERROR:
+                        void messageApi.error(
+                            <>
+                                <strong>用户名</strong>或<strong>密码</strong>错误，请重试
+                            </>
+                        )
+                        setIsLoggingIn(false)
+                        break
+                    case SYSTEM_USER_DISABLE:
+                        void messageApi.error(
+                            <>
+                                该用户已被<strong>禁用</strong>
+                            </>
+                        )
+                        setIsLoggingIn(false)
+                        break
+                    default:
+                        void messageApi.error(
+                            <>
+                                <strong>服务器出错了</strong>
+                            </>
+                        )
+                        setIsLoggingIn(false)
+                }
+            })
+            .catch(() => {
+                setIsLoggingIn(false)
+            })
     }
 
     return (
diff --git a/src/services/index.tsx b/src/services/index.tsx
index 48939ab..d89ba76 100644
--- a/src/services/index.tsx
+++ b/src/services/index.tsx
@@ -12,7 +12,7 @@ import { message } from 'antd'
 
 const service: AxiosInstance = axios.create({
     baseURL: import.meta.env.VITE_API_URL,
-    timeout: 10000,
+    timeout: 30000,
     withCredentials: false
 })
 
-- 
2.49.1