|
@@ -1,5 +1,5 @@
|
|
|
import { LockOutlined, UserOutlined } from '@ant-design/icons'
|
|
import { LockOutlined, UserOutlined } from '@ant-design/icons'
|
|
|
-import { Alert, message, Tabs } from 'antd'
|
|
|
|
|
|
|
+import { Alert, message, notification, Tabs } from 'antd'
|
|
|
import React, { useState } from 'react'
|
|
import React, { useState } from 'react'
|
|
|
import ProForm, { ProFormCheckbox, ProFormText } from '@ant-design/pro-form'
|
|
import ProForm, { ProFormCheckbox, ProFormText } from '@ant-design/pro-form'
|
|
|
import { useIntl, Link, history, FormattedMessage, SelectLang, useModel } from 'umi'
|
|
import { useIntl, Link, history, FormattedMessage, SelectLang, useModel } from 'umi'
|
|
@@ -21,16 +21,6 @@ const LoginMessage = ({ content }) => (
|
|
|
/>
|
|
/>
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
-/** 此方法会跳转到 redirect 参数所在的位置 */
|
|
|
|
|
-const goto = () => {
|
|
|
|
|
- if (!history) return
|
|
|
|
|
- setTimeout(() => {
|
|
|
|
|
- const { query } = history.location
|
|
|
|
|
- const { redirect } = query
|
|
|
|
|
- history.push(redirect || '/')
|
|
|
|
|
- }, 10)
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
const Login = () => {
|
|
const Login = () => {
|
|
|
const [submitting, setSubmitting] = useState(false)
|
|
const [submitting, setSubmitting] = useState(false)
|
|
|
const [userLoginState, setUserLoginState] = useState({})
|
|
const [userLoginState, setUserLoginState] = useState({})
|
|
@@ -49,6 +39,23 @@ const Login = () => {
|
|
|
// onMessage
|
|
// onMessage
|
|
|
// })
|
|
// })
|
|
|
}
|
|
}
|
|
|
|
|
+ return userInfo
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /** 此方法会跳转到 redirect 参数所在的位置 */
|
|
|
|
|
+ const goto = username => {
|
|
|
|
|
+ if (!history) return
|
|
|
|
|
+ setTimeout(() => {
|
|
|
|
|
+ const { query } = history.location
|
|
|
|
|
+ const { redirect } = query
|
|
|
|
|
+ history.push(redirect || '/')
|
|
|
|
|
+ return notification.success({
|
|
|
|
|
+ message: intl.formatMessage({ id: 'pages.login.success.title' }),
|
|
|
|
|
+ description:
|
|
|
|
|
+ redirect && `${intl.formatMessage({ id: 'pages.login.success.desc' })}: ${username}`,
|
|
|
|
|
+ duration: 3
|
|
|
|
|
+ })
|
|
|
|
|
+ }, 10)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
const handleSubmit = async values => {
|
|
const handleSubmit = async values => {
|
|
@@ -59,14 +66,14 @@ const Login = () => {
|
|
|
if (res.code === 0) {
|
|
if (res.code === 0) {
|
|
|
setAuthCache(TOKEN_KEY, res.data.token, DEFAULT_CACHE_TIME)
|
|
setAuthCache(TOKEN_KEY, res.data.token, DEFAULT_CACHE_TIME)
|
|
|
|
|
|
|
|
- const defaultLoginSuccessMessage = intl.formatMessage({
|
|
|
|
|
- id: 'pages.login.success',
|
|
|
|
|
- defaultMessage: '登录成功!'
|
|
|
|
|
- })
|
|
|
|
|
- message.success(defaultLoginSuccessMessage)
|
|
|
|
|
- await fetchUserInfo()
|
|
|
|
|
|
|
+ // const defaultLoginSuccessMessage = intl.formatMessage({
|
|
|
|
|
+ // id: 'pages.login.success',
|
|
|
|
|
+ // defaultMessage: '登录成功!'
|
|
|
|
|
+ // })
|
|
|
|
|
+ // message.success(defaultLoginSuccessMessage)
|
|
|
|
|
+ const userinfo = await fetchUserInfo()
|
|
|
/** 此方法会跳转到 redirect 参数所在的位置 */
|
|
/** 此方法会跳转到 redirect 参数所在的位置 */
|
|
|
- return goto()
|
|
|
|
|
|
|
+ return goto(userinfo?.currentUser?.username)
|
|
|
}
|
|
}
|
|
|
// 如果失败去设置用户错误信息
|
|
// 如果失败去设置用户错误信息
|
|
|
setUserLoginState(res.msg)
|
|
setUserLoginState(res.msg)
|