完成代码，提交了再删除其他页面

src/store/modules/asyncRoute.ts

@@ -89,10 +89,11 @@ export const useAsyncRouteStore = defineStore({
     async generateRoutes(data) {
       let accessedRouters;
       const permissionsList = data.permissions ?? [];
+      const hasPermissions = permissionsList.length > 0;
       const routeFilter = (route) => {
         const { meta } = route;
         const { permissions } = meta || {};
-        if (!permissions) return true;
+        if (!permissions || !hasPermissions) return true;
         return permissionsList.some((item) => permissions.includes(item.value));
       };
       const { permissionMode } = useProjectSetting();

src/store/modules/user.ts

@@ -3,13 +3,15 @@ import { store } from '@/store';
 import { ACCESS_TOKEN, CURRENT_USER, IS_SCREENLOCKED } from '@/store/mutation-types';
 import { ResultEnum } from '@/enums/httpEnum';
 
-import { getUserInfo as getUserInfoApi, login } from '@/api/system/user';
+import { getUserInfo as getUserInfoApi, login, logout as logoutApi } from '@/api/system/user';
+import type { LoginParams, LoginRes, UserInfoData } from '@/api/system/user';
+import { encryptPassword } from '@/utils/encrypt';
 import { storage } from '@/utils/Storage';
 
-export type UserInfoType = {
-  // TODO: add your own data
+export type UserInfoType = Partial<UserInfoData> & {
   username: string;
-  email: string;
+  email?: string;
+  permissions?: any[];
 };
 
 export interface IUserState {
@@ -62,10 +64,21 @@ export const useUserStore = defineStore({
       this.info = info;
     },
     // 登录
-    async login(params: any) {
-      const response = await login(params);
+    async login(params: LoginParams): Promise<LoginRes> {
+      const encryptedPassword = encryptPassword(params.password);
+      if (!encryptedPassword) {
+        return {
+          code: ResultEnum.ERROR,
+          message: '密码加密失败',
+        };
+      }
+
+      const response = await login({
+        ...params,
+        password: encryptedPassword,
+      });
       const { code, data } = response;
-      if (code === ResultEnum.SUCCESS) {
+      if (code === ResultEnum.SUCCESS && data) {
         const ex = data.tokenTimeout || 7 * 24 * 60 * 60;
         storage.set(ACCESS_TOKEN, data.token, ex);
         storage.set(CURRENT_USER, data, ex);
@@ -81,25 +94,37 @@ export const useUserStore = defineStore({
 
     // 获取用户信息
     async getInfo() {
-      const data = await getUserInfoApi();
-      const { result } = data;
-      if (result.permissions && result.permissions.length) {
-        const permissionsList = result.permissions;
-        this.setPermissions(permissionsList);
-        this.setUserInfo(result);
-      } else {
-        throw new Error('getInfo: permissionsList must be a non-null array !');
+      const response = await getUserInfoApi();
+      const { data } = response;
+      if (!data) {
+        throw new Error(response.message || 'getInfo: user info is empty');
       }
-      this.setAvatar(result.avatar);
-      return result;
+
+      const permissionsList = data.permissions ?? [];
+      const userInfo: UserInfoType = {
+        ...data,
+        email: '',
+        permissions: permissionsList,
+      };
+      this.setPermissions(permissionsList);
+      this.setUserInfo(userInfo);
+      this.setAvatar(data.avatarUrl || '');
+      return userInfo;
     },
 
     // 登出
     async logout() {
-      this.setPermissions([]);
-      this.setUserInfo({ username: '', email: '' });
-      storage.remove(ACCESS_TOKEN);
-      storage.remove(CURRENT_USER);
+      try {
+        await logoutApi();
+      } finally {
+        this.setToken('');
+        this.setPermissions([]);
+        this.setAvatar('');
+        this.setUserInfo({ username: '', email: '', permissions: [] });
+        storage.remove(ACCESS_TOKEN);
+        storage.remove(CURRENT_USER);
+        storage.remove(IS_SCREENLOCKED);
+      }
     },
   },
 });