|
@@ -32,7 +32,7 @@ export async function getInitialState(): Promise<{
|
|
|
if (refresh_token) {
|
|
|
localStorage.setItem('refresh_token', refresh_token);
|
|
|
}
|
|
|
-
|
|
|
+ console.log('getInitialState');
|
|
|
//如果没有 取缓存
|
|
|
// if (!refresh_token) {
|
|
|
// refresh_token = localStorage.getItem('refresh_token');
|
|
@@ -41,15 +41,14 @@ export async function getInitialState(): Promise<{
|
|
|
const fetchUser = async () => {
|
|
|
try {
|
|
|
access_token = localStorage.getItem('access_token');
|
|
|
+ if (!access_token) return; //随后去掉
|
|
|
const res = await checkToken({ token: access_token });
|
|
|
var resUser = res.data;
|
|
|
} catch (err) {
|
|
|
history.push(loginPath);
|
|
|
}
|
|
|
-
|
|
|
if (resUser) {
|
|
|
var userObj = userData.getInstance();
|
|
|
- // console.log('user.name', user.age);
|
|
|
userObj.setUser(resUser);
|
|
|
return resUser;
|
|
|
} else {
|
|
@@ -77,10 +76,10 @@ export async function getInitialState(): Promise<{
|
|
|
//20分钟后再执行
|
|
|
setTimeout(() => {
|
|
|
reFreshUser();
|
|
|
- }, 1200000);
|
|
|
+ }, 12000);
|
|
|
};
|
|
|
|
|
|
- reFreshUser();
|
|
|
+ await reFreshUser();
|
|
|
|
|
|
// || {
|
|
|
// companyId: '245e7060643811eb934c0237aedb39a6',
|