登录登出

src/api/sys/model/userModel.ts

@@ -18,6 +18,10 @@ export interface LoginResultModel {
   userId: string | number;
   token: string;
   role: RoleInfo;
+  avatar: string;
+  roleName: string;
+  userName: string;
+  roleId: string | number;
 }
 
 /**

src/api/sys/user.ts

@@ -4,9 +4,9 @@ import { encodeStr } from '/@/utils/encodeUtil';
 import { ErrorMessageMode } from '/#/axios';
 
 enum Api {
-  // Login = '/basic-api/l  ogin',
+  // Login = '/basic-api/login',
   Login = '/newV4/service/manage/login',
-  Logout = '/basic-api/ogout',
+  Logout = '/basic-api/logout',
   GetUserInfo = '/basic-api/getUserInfo',
   GetPermCode = '/getPermCode',
 }

src/store/modules/user.ts

@@ -92,7 +92,14 @@ export const useUserStore = defineStore({
         const { goHome = true, mode, ...loginParams } = params;
         const data = await loginApi(loginParams, mode);
         const { token } = data;
-
+        this.setUserInfo({
+          ...data,
+          userId:data.userId,
+          realName: data.roleName,
+          username:data.userName,
+          avatar:data.avatar||'https://q1.qlogo.cn/g?b=qq&nk=339449197&s=640',
+          roles:[data.roleId],
+        });
         // save token
         this.setToken(token);
         return this.afterLoginAction(goHome);
@@ -124,8 +131,9 @@ export const useUserStore = defineStore({
     },
     async getUserInfoAction(): Promise<UserInfo | null> {
       if (!this.getToken) return null;
-      const userInfo = await getUserInfo();
-      console.log('getUserInfo ',userInfo)
+      // const userInfo = await getUserInfo();
+      const userInfo = this.userInfo || getAuthCache<UserInfo>(USER_INFO_KEY);
+      console.log('getUserInfo ',userInfo,'USER_INFO_KEY',)
       const { roles = [] } = userInfo;
       if (isArray(roles)) { 
         const roleList = roles.map((item) => item.value) as RoleEnum[];