|
|
|
@ -18,7 +18,7 @@ import { createPermissionGuard } from './permissionGuard';
@@ -18,7 +18,7 @@ import { createPermissionGuard } from './permissionGuard';
|
|
|
|
|
import { createStateGuard } from './stateGuard'; |
|
|
|
|
import nProgress from 'nprogress'; |
|
|
|
|
import projectSetting from '/@/settings/projectSetting'; |
|
|
|
|
import { User } from '/@/api/platform/core/entity/user'; |
|
|
|
|
import type { User } from '/@/api/platform/core/entity/user'; |
|
|
|
|
import { synchronousAuthenticationUser } from '/@/api/platform/system/controller/user'; |
|
|
|
|
import { isEmpty } from '/@/utils/is'; |
|
|
|
|
|
|
|
|
@ -123,6 +123,7 @@ export function createSynchronousAuthenticationUserGuard(router: Router) {
@@ -123,6 +123,7 @@ export function createSynchronousAuthenticationUserGuard(router: Router) {
|
|
|
|
|
const token = userStore.getAccessToken; |
|
|
|
|
const userInfo = userStore.getUserInfo; |
|
|
|
|
if (token && !isEmpty(userInfo)) { |
|
|
|
|
try { |
|
|
|
|
const kiccUser = await synchronousAuthenticationUser(); |
|
|
|
|
// 同步当前身份验证用户到用户信息中
|
|
|
|
|
Object.assign(userInfo, { |
|
|
|
@ -135,8 +136,11 @@ export function createSynchronousAuthenticationUserGuard(router: Router) {
@@ -135,8 +136,11 @@ export function createSynchronousAuthenticationUserGuard(router: Router) {
|
|
|
|
|
accountNonLocked: kiccUser.accountNonLocked, |
|
|
|
|
accountNonExpired: kiccUser.accountNonExpired, |
|
|
|
|
credentialsNonExpired: kiccUser.credentialsNonExpired |
|
|
|
|
} as User); |
|
|
|
|
} as Partial<User>); |
|
|
|
|
userStore.setUserInfo(userInfo); |
|
|
|
|
} catch { |
|
|
|
|
console.log('同步授权用户信息失败,请检查token是否过期!'); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return true; |
|
|
|
|
}); |
|
|
|
|