|
@@ -94,11 +94,11 @@ export const useUserStore = defineStore({
|
|
const { token } = data;
|
|
const { token } = data;
|
|
this.setUserInfo({
|
|
this.setUserInfo({
|
|
...data,
|
|
...data,
|
|
- userId:data.userId,
|
|
|
|
|
|
+ userId: data.userId,
|
|
realName: data.roleName,
|
|
realName: data.roleName,
|
|
- username:data.userName,
|
|
|
|
- avatar:data.avatar||'https://q1.qlogo.cn/g?b=qq&nk=339449197&s=640',
|
|
|
|
- roles:[data.roleId],
|
|
|
|
|
|
+ username: data.userName,
|
|
|
|
+ avatar: data.avatar || 'https://q1.qlogo.cn/g?b=qq&nk=339449197&s=640',
|
|
|
|
+ roles: [data.roleId],
|
|
});
|
|
});
|
|
// save token
|
|
// save token
|
|
this.setToken(token);
|
|
this.setToken(token);
|
|
@@ -111,7 +111,6 @@ export const useUserStore = defineStore({
|
|
if (!this.getToken) return null;
|
|
if (!this.getToken) return null;
|
|
// get user info
|
|
// get user info
|
|
const userInfo = await this.getUserInfoAction();
|
|
const userInfo = await this.getUserInfoAction();
|
|
- console.log('getUserInfoAction',userInfo)
|
|
|
|
const sessionTimeout = this.sessionTimeout;
|
|
const sessionTimeout = this.sessionTimeout;
|
|
if (sessionTimeout) {
|
|
if (sessionTimeout) {
|
|
this.setSessionTimeout(false);
|
|
this.setSessionTimeout(false);
|
|
@@ -132,14 +131,14 @@ export const useUserStore = defineStore({
|
|
async getUserInfoAction(): Promise<UserInfo | null> {
|
|
async getUserInfoAction(): Promise<UserInfo | null> {
|
|
if (!this.getToken) return null;
|
|
if (!this.getToken) return null;
|
|
const userInfo = await getUserInfo();
|
|
const userInfo = await getUserInfo();
|
|
- const { roleId } = userInfo;
|
|
|
|
- if (isArray(roleId)) {
|
|
|
|
|
|
+ const { roleId } = userInfo;
|
|
|
|
+ if (isArray(roleId)) {
|
|
const roleList = roleId.map((item) => item.value) as RoleEnum[];
|
|
const roleList = roleId.map((item) => item.value) as RoleEnum[];
|
|
this.setRoleList(roleList);
|
|
this.setRoleList(roleList);
|
|
- }else if(roleId) {
|
|
|
|
|
|
+ } else if (roleId) {
|
|
userInfo.roles = [roleId];
|
|
userInfo.roles = [roleId];
|
|
this.setRoleList([]);
|
|
this.setRoleList([]);
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
userInfo.roles = [];
|
|
userInfo.roles = [];
|
|
this.setRoleList([]);
|
|
this.setRoleList([]);
|
|
}
|
|
}
|