liuchang/fe_service_ebtp_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8.15 登录过程中用户信息错误导致登录失败的业务处理

Browse Source
This commit is contained in:
jl-zhoujl2
2022-08-15 09:14:14 +08:00
parent c060f3fa23
commit 3fe854ff86
7 changed files with 85 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/pages/401.tsx
View File

@ -1,12 +1,14 @@
import { logoutTokenApi } from '@/services/login';
import { getURLInformation, isNotEmpty } from '@/utils/CommonUtils';
import { getSessionRoleData } from '@/utils/session';
import { Result, Typography } from 'antd';
import { Button, Result, Typography } from 'antd';
import React, { useEffect, useState } from 'react';
import { history } from 'umi';
const message = {
const messageMap = {
401: '您的用户信息有误，请联系管理员',
402: '您的用户角色信息缺失，请联系管理员',
403: '您的用户角色信息异常，请重新登录',
90401: '您的登录已超时，请重新登录',
404: '系统错误，请联系管理员',
};
@ -16,6 +18,7 @@ const RequestTimeoutPage: React.FC<{}> = () => {
const { Text } = Typography;
const [time, setTime] = useState<number>(10);
const roleData = getSessionRoleData();
const token = sessionStorage.getItem('Authorization');
useEffect(() => {
let timeInteval: any
@ -44,11 +47,18 @@ const RequestTimeoutPage: React.FC<{}> = () => {
})
}
}
const redirectLogin = () => {
logoutTokenApi({ mall3_token: token }).then(res => {
history.replace({
pathname: '/userformal/login',
})
})
}
return (
<Result
title={message[code]}
extra={isNotEmpty(roleData) && code == 402 && <Text type="secondary" strong>{time}秒后进入默认角色</Text>}
title={messageMap[code]}
extra={isNotEmpty(roleData) && code == 402 ? <Text type="secondary" strong>{time}秒后进入默认角色</Text> : code == 403 ? <Button type="primary" onClick={() => redirectLogin()}>重新登录</Button> : null}
/>
);
};

14
src/pages/LoadingPage/index.tsx
View File

@ -38,10 +38,16 @@ const Loading: React.FC<{}> = () => {
await cooperReloadToken('', headers)
await getUserData(token, url, extra, 1)
} else if (userType == '2') {//专家
await refreshTokenApi(params, header).then(async res => {
if (res?.success == true) {
sessionStorage.setItem('Authorization', res?.data?.value);
await getUserData(token, url, extra, 1)
// await refreshTokenApi(params, header).then(async res => {
// if (res?.success == true) {
// sessionStorage.setItem('Authorization', res?.data?.value);
// await getUserData(token, url, extra, 1)
// }
// })
history.replace({
pathname: '/401',
query: {
code: '403',
}
})
}

6
src/pages/usercloud/login/index.tsx
View File

@ -71,7 +71,7 @@ const Login: React.FC<LoginProps> = (props) => {
await refreshTokenApi(params, header).then(res => {
if (res?.success == true) {
sessionStorage.setItem('Authorization', res?.data?.value);
sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
// sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
sessionStorage.setItem('scope', res?.data?.scope);
history.push('/redirect');
}
@ -93,7 +93,7 @@ const Login: React.FC<LoginProps> = (props) => {
refreshToken(res?.data)
} else {
sessionStorage.setItem('Authorization', res?.data?.value);
sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
// sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
sessionStorage.setItem('scope', res?.data?.scope);
history.push('/redirect');
}
@ -114,7 +114,7 @@ const Login: React.FC<LoginProps> = (props) => {
refreshToken(res?.data)
} else {
sessionStorage.setItem('Authorization', res?.data?.value);
sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
// sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
sessionStorage.setItem('scope', res?.data?.scope);
history.push('/redirect');
}

6
src/pages/usercooper/login/index.tsx
View File

@ -71,7 +71,7 @@ const Login: React.FC<LoginProps> = (props) => {
await refreshTokenApi(params, header).then(res => {
if (res?.success == true) {
sessionStorage.setItem('Authorization', res?.data?.value);
sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
// sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
sessionStorage.setItem('scope', res?.data?.scope);
history.push('/redirect');
}
@ -93,7 +93,7 @@ const Login: React.FC<LoginProps> = (props) => {
refreshToken(res?.data)
} else {
sessionStorage.setItem('Authorization', res?.data?.value);
sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
// sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
sessionStorage.setItem('scope', res?.data?.scope);
history.push('/redirect');
}
@ -115,7 +115,7 @@ const Login: React.FC<LoginProps> = (props) => {
refreshToken(res?.data)
} else {
sessionStorage.setItem('Authorization', res?.data?.value);
sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
// sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
sessionStorage.setItem('scope', res?.data?.scope);
history.push('/redirect');
}

6
src/pages/userexpert/login/index.tsx
View File

@ -71,7 +71,7 @@ const Login: React.FC<LoginProps> = (props) => {
await refreshTokenApi(params, header).then(res => {
if (res?.success == true) {
sessionStorage.setItem('Authorization', res?.data?.value);
sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
// sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
sessionStorage.setItem('scope', res?.data?.scope);
history.push('/redirect');
}
@ -93,7 +93,7 @@ const Login: React.FC<LoginProps> = (props) => {
refreshToken(res?.data)
} else {
sessionStorage.setItem('Authorization', res?.data?.value);
sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
// sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
sessionStorage.setItem('scope', res?.data?.scope);
history.push('/redirect');
}
@ -114,7 +114,7 @@ const Login: React.FC<LoginProps> = (props) => {
refreshToken(res?.data)
} else {
sessionStorage.setItem('Authorization', res?.data?.value);
sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
// sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
sessionStorage.setItem('scope', res?.data?.scope);
history.push('/redirect');
}

4
src/pages/userformal/login/index.tsx
View File

@ -51,7 +51,7 @@ const Index: React.FC<{}> = () => {
await refreshTokenApi(params, header).then(res => {
if (res?.success == true) {
sessionStorage.setItem('Authorization', res?.data?.value);
sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
// sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
sessionStorage.setItem('scope', res?.data?.scope);
history.push('/redirect');
}
@ -65,7 +65,7 @@ const Index: React.FC<{}> = () => {
refreshToken(res?.data)
} else {
sessionStorage.setItem('Authorization', res?.data?.value);
sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
// sessionStorage.setItem('refreshToken', res?.data?.refreshToken.value);
sessionStorage.setItem('scope', res?.data?.scope);
history.push('/redirect');
}

12
src/services/login.ts
View File

@ -107,4 +107,14 @@ export async function getFakeCaptcha(params: any) {
});
}
/**
* 用户登出
* @param params
* @returns
*/
export async function logoutTokenApi(params: any) {
return request('/api/auth/logout', {
method: 'GET',
params: params
});
}