fix: 登陆相关逻辑修复1/2

.vscode/settings.json

@@ -50,7 +50,7 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[typescript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
   },
   "[json]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"

apps/web-ele/src/api/core/auth.ts

@@ -11,17 +11,46 @@ export namespace AuthApi {
 
   /** 登录接口返回值 */
   export interface LoginResult {
-    bmid: number;
-    bm: null | string;
-    token: string;
-    gw: string;
-    workerid: string;
+    /**
+     * 用户名
+     */
+    account: string;
+    /**
+     * 用户id
+     */
     accountid: string;
-    timeout: number;
+    /**
+     * 部门
+     */
+    bm: null | string;
+    /**
+     * 部门id
+     */
+    bmid: number;
+    /**
+     * 角色列表
+     */
+    grouplist: string;
+    /**
+     * 昵称
+     */
     nickname: string;
-    account: string;
+    /**
+     * 权限列表
+     */
     popedom: string;
-    grouplist: string;
+    /**
+     * 过期时间
+     */
+    timeout: number;
+    /**
+     * 令牌
+     */
+    token: string;
+    /**
+     * 职员id
+     */
+    workerid: string;
   }
 
   export interface RefreshTokenResult {

apps/web-ele/src/api/core/menu.ts

@@ -6,5 +6,7 @@ import { requestClient } from '#/api/request';
  * 获取用户所有菜单
  */
 export async function getAllMenusApi() {
-  return requestClient.get<RouteRecordStringComponent[]>('/menu/all');
+  return requestClient.post<RouteRecordStringComponent[]>(
+    '/api/query/list?pagevalue=7',
+  );
 }

apps/web-ele/src/router/guard.ts

@@ -92,8 +92,9 @@ function setupAccessGuard(router: Router) {
 
     // 生成路由表
     // 当前登录用户拥有的角色标识列表
-    const userInfo = userStore.userInfo || (await authStore.fetchUserInfo());
-    const userRoles = userInfo.roles ?? [];
+    const userInfo = (userStore.userInfo ||
+      (await authStore.fetchUserInfo())) as any;
+    const userRoles = userInfo?.grouplist ?? [];
 
     // 生成菜单和路由
     const { accessibleMenus, accessibleRoutes } = await generateAccess({

apps/web-ele/src/store/auth.ts

@@ -11,9 +11,8 @@ import { ElNotification } from 'element-plus';
 import { defineStore } from 'pinia';
 
 import {
-  getAccessCodesApi,
+  // getAccessCodesApi,
   getLoginCaptchaApi,
-  getUserInfoApi,
   loginApi,
   logoutApi,
 } from '#/api';
@@ -26,6 +25,8 @@ export const useAuthStore = defineStore('auth', () => {
 
   const loginLoading = ref(false);
 
+  const userStorage = useStorage('user');
+
   /**
    * 异步处理登录操作
    * Asynchronously handle the login process
@@ -66,6 +67,7 @@ export const useAuthStore = defineStore('auth', () => {
       // "grouplist": "1"
 
       const { token: accessToken } = res;
+      userStorage.setItem(res);
 
       // 如果成功获取到 accessToken
       if (accessToken) {
@@ -73,12 +75,14 @@ export const useAuthStore = defineStore('auth', () => {
         accessStore.setAccessToken(accessToken);
 
         // 获取用户信息并存储到 accessStore 中
-        const [fetchUserInfoResult, accessCodes] = await Promise.all([
-          fetchUserInfo(),
-          getAccessCodesApi(),
-        ]);
+        const fetchUserInfoResult = (await fetchUserInfo()) as any;
+        const accessCodes = fetchUserInfoResult.popedom;
+        // const [fetchUserInfoResult, accessCodes] = await Promise.all([
+        //   fetchUserInfo(),
+        //   getAccessCodesApi(),
+        // ]);
 
-        userInfo = fetchUserInfoResult;
+        userInfo = fetchUserInfoResult as any;
 
         userStore.setUserInfo(userInfo);
         accessStore.setAccessCodes(accessCodes);
@@ -88,7 +92,7 @@ export const useAuthStore = defineStore('auth', () => {
         } else {
           onSuccess
             ? await onSuccess?.()
-            : await router.push(userInfo.homePath || DEFAULT_HOME_PATH);
+            : await router.push(userInfo?.homePath || DEFAULT_HOME_PATH);
         }
 
         if (userInfo?.realName) {
@@ -129,10 +133,11 @@ export const useAuthStore = defineStore('auth', () => {
   }
 
   async function fetchUserInfo() {
-    let userInfo: null | UserInfo = null;
-    userInfo = await getUserInfoApi();
-    userStore.setUserInfo(userInfo);
-    return userInfo;
+    const userInfoData = userStorage.getItem();
+    // let userInfo: null | UserInfo = null;
+    // userInfo = await getUserInfoApi();
+    userStore.setUserInfo(userInfoData as any);
+    return userInfoData;
   }
 
   function $reset() {

packages/@core/base/typings/src/basic.d.ts

@@ -8,26 +8,17 @@ type SelectOption = BasicOption;
 type TabOption = BasicOption;
 
 interface BasicUserInfo {
-  /**
-   * 头像
-   */
-  avatar: string;
-  /**
-   * 用户昵称
-   */
-  realName: string;
-  /**
-   * 用户角色
-   */
-  roles?: string[];
-  /**
-   * 用户id
-   */
-  userId: string;
-  /**
-   * 用户名
-   */
-  username: string;
+  account: string;
+  accountid: string;
+  bm: null | string;
+  bmid: number;
+  grouplist: string;
+  gw: string;
+  nickname: string;
+  popedom: string;
+  timeout: number;
+  token: string;
+  workerid: string;
 }
 
 type ClassType = Array<object | string> | object | string;

packages/stores/src/modules/user.ts

@@ -3,25 +3,45 @@ import { acceptHMRUpdate, defineStore } from 'pinia';
 interface BasicUserInfo {
   [key: string]: any;
   /**
-   * 头像
+   * 用户名
    */
-  avatar: string;
+  account: string;
   /**
-   * 用户昵称
+   * 用户id
    */
-  realName: string;
+  accountid: string;
   /**
-   * 用户角色
+   * 部门
    */
-  roles?: string[];
+  bm: null | string;
   /**
-   * 用户id
+   * 部门id
    */
-  userId: string;
+  bmid: number;
   /**
-   * 用户名
+   * 角色列表
+   */
+  grouplist: string;
+  /**
+   * 昵称
+   */
+  nickname: string;
+  /**
+   * 权限列表
+   */
+  popedom: string;
+  /**
+   * 过期时间
+   */
+  timeout: number;
+  /**
+   * 令牌
+   */
+  token: string;
+  /**
+   * 职员id
    */
-  username: string;
+  workerid: string;
 }
 
 interface AccessState {

packages/types/src/user.ts

@@ -2,19 +2,7 @@ import type { BasicUserInfo } from '@vben-core/typings';
 
 /** 用户信息 */
 interface UserInfo extends BasicUserInfo {
-  /**
-   * 用户描述
-   */
-  desc: string;
-  /**
-   * 首页地址
-   */
-  homePath: string;
-
-  /**
-   * accessToken
-   */
-  token: string;
+  [key: string]: any;
 }
 
 export type { UserInfo };