diff --git a/src/stores/Auth.js b/src/stores/Auth.js index b462a1d..18dfc3b 100644 --- a/src/stores/Auth.js +++ b/src/stores/Auth.js @@ -130,7 +130,7 @@ const useAuthStore = create(obervseLifecycle((set, get) => ({ const now = new Date() const diffTime = now.getTime() - lastReqDate.getTime() const diffHours = diffTime/1000/60/60 - if (diffHours > 4) { + if (diffHours > 1) { loginTimeout() } } @@ -143,7 +143,8 @@ const useAuthStore = create(obervseLifecycle((set, get) => ({ loginTimeout: () => { const { tokenInterval } = get() - // TODO: 这里没有清理 token,刷新后可以正常使用系统 + const { clearStorage } = usingStorage() + clearStorage() clearInterval(tokenInterval) set(() => ({ tokenTimeout: true diff --git a/src/views/App.jsx b/src/views/App.jsx index 22d0737..2ac059d 100644 --- a/src/views/App.jsx +++ b/src/views/App.jsx @@ -4,7 +4,7 @@ import { Layout, Menu, ConfigProvider, theme, Dropdown, Space, Row, Col, Badge, import { DownOutlined } from '@ant-design/icons'; import 'antd/dist/reset.css'; import AppLogo from '@/assets/logo-gh.png'; -import { isEmpty } from '@/utils/commons'; +import { isEmpty, isNotEmpty } from '@/utils/commons'; import Language from '../i18n/LanguageSwitcher'; import { useTranslation } from 'react-i18next'; import zhLocale from 'antd/locale/zh_CN'; @@ -43,13 +43,15 @@ function App() { const needToLogin = href !== '/login' && isEmpty(loginToken) useEffect(() => { - fetchUserDetail(loginToken) - .then(u => { - setUserDetail({ - username: u.LoginName, - travelAgencyName: u.VName, + if (isNotEmpty(loginToken)) { + fetchUserDetail(loginToken) + .then(u => { + setUserDetail({ + username: u.LoginName, + travelAgencyName: u.VName, + }) }) - }) + } }, [loginToken]) useEffect(() => {