From 7399293fd3d354f614ac4dc85f0c6c553587eacb Mon Sep 17 00:00:00 2001
From: zhengpengju <zpj0219@126.com>
Date: Tue, 15 Mar 2022 16:06:50 +0800
Subject: [PATCH] fix bug

---
 web/src/app.tsx                        | 6 +++++-
 web/src/pages/user/Login/index.tsx     | 4 ++--
 web/src/services/ant-design-pro/api.ts | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/web/src/app.tsx b/web/src/app.tsx
index 7bbc8ef..61def5b 100644
--- a/web/src/app.tsx
+++ b/web/src/app.tsx
@@ -8,7 +8,7 @@ import { currentUser as queryCurrentUser, queryPersonTxByYw } from './services/a
 import { BookOutlined, LinkOutlined } from '@ant-design/icons';
 import { RequestConfig } from 'umi';
 import { ResponseError } from 'umi-request';
-import { notification } from 'antd';
+import { message, notification } from 'antd';
 import cookie from 'react-cookies';
 
 const isDev = process.env.NODE_ENV === 'development';
@@ -96,6 +96,10 @@ const responseInterceptor = async (response: any, options: any) => {
   }
   console.log('返回了', response);  
   console.log('options', options);
+  console.log('data', data)
+  if(data?.success === false && options?.url === '/dsideal_yy/checkLoginStatus'){
+    message.error(data?.info)
+  }
   return response;
 };
 
diff --git a/web/src/pages/user/Login/index.tsx b/web/src/pages/user/Login/index.tsx
index 50cbb63..7fc3245 100644
--- a/web/src/pages/user/Login/index.tsx
+++ b/web/src/pages/user/Login/index.tsx
@@ -54,11 +54,11 @@ const Login: React.FC = () => {
         history.push(redirect || '/');
         return;
       }
-      console.log(msg);
+      console.log('msg..', msg);
       // 如果失败去设置用户错误信息
       setUserLoginState(msg);
     } catch (error) {
-      const defaultLoginFailureMessage = '登录失败，请重试！';
+      const defaultLoginFailureMessage = msg?.info;
       message.error(defaultLoginFailureMessage);
     }
   };
diff --git a/web/src/services/ant-design-pro/api.ts b/web/src/services/ant-design-pro/api.ts
index 72885c5..4cbb6fc 100644
--- a/web/src/services/ant-design-pro/api.ts
+++ b/web/src/services/ant-design-pro/api.ts
@@ -37,9 +37,9 @@ export async function outLogin(options?: { [key: string]: any }) {
 }
 
 /** 登录接口 POST /api/login/account */
-export async function login(body: API.LoginParams, options?: { [key: string]: any }) {
-  return request<API.LoginResult>('/dsideal_yy/login/doLogin?login_type=1', {
-    method: 'POST',
+export async function login(body: API.LoginParams, options?: { [key: string]: any }) {  
+  return request<API.LoginResult>('/dsideal_yy/checkLoginStatus', { // /dsideal_yy/login/doLogin?login_type=1
+    method: 'POST', 
     requestType: 'form',
     data: body,
     ...(options || {}),