|
@@ -28,11 +28,9 @@ export async function getInitialState(): Promise<{
|
|
|
|
|
|
var dealRes = deal_locationsearch();
|
|
|
var persagyToken = dealRes[0];
|
|
|
- console.log(persagyToken, '----persagyToken');
|
|
|
- console.log(decrypt(persagyToken), '---解密2');
|
|
|
+ let deCode = decodeURIComponent(persagyToken);
|
|
|
|
|
|
- let userName = persagyToken && decrypt(persagyToken);
|
|
|
- console.log(userName, '---userName');
|
|
|
+ let userName = persagyToken && decrypt(deCode);
|
|
|
|
|
|
//如果有值 存起来
|
|
|
if (access_token) {
|
|
@@ -67,12 +65,9 @@ export async function getInitialState(): Promise<{
|
|
|
const queryUserFunc = async () => {
|
|
|
try {
|
|
|
//验证acces_token 获取用户数据
|
|
|
- console.log(userName, '---获取用户数据');
|
|
|
const res2 = await queryUser({ criteria: { username: userName } });
|
|
|
var resUser = res2.content[0];
|
|
|
} catch (err) {
|
|
|
- console.log('--退出1');
|
|
|
-
|
|
|
history.push(loginPath);
|
|
|
}
|
|
|
|
|
@@ -82,22 +77,17 @@ export async function getInitialState(): Promise<{
|
|
|
userObj.setUser(resUser);
|
|
|
return resUser;
|
|
|
} else {
|
|
|
- console.log('--退出2');
|
|
|
history.push(loginPath);
|
|
|
return undefined;
|
|
|
}
|
|
|
};
|
|
|
|
|
|
- console.log(projectObj.projectId, '---projectObj.projectId');
|
|
|
-
|
|
|
//projectId = 'Pj1101080259';
|
|
|
if (projectObj.projectId == 'Pj3301100002') {
|
|
|
//之江项目 验证token
|
|
|
- console.log(userName, '---验证token');
|
|
|
if (userName) {
|
|
|
currentUser = await queryUserFunc();
|
|
|
} else {
|
|
|
- console.log('--退出3');
|
|
|
history.push(loginPath);
|
|
|
}
|
|
|
} else {
|