From 28ae5f793ea7e04483be2332c66e51bd0b0334d4 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Sat, 29 Jul 2023 12:40:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=99=BB=E5=BD=95=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=BB=8E=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E8=8E=B7=E5=8F=96=E8=8F=9C=E5=8D=95=E3=80=82?=
 =?UTF-8?q?=E7=9B=AE=E7=9A=84=EF=BC=9A=E5=8A=A0=E5=BF=AB=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E7=9A=84=E5=8A=A0=E8=BD=BD=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/login.ts           |  6 ------
 src/api/base/menu.ts            | 14 --------------
 src/api/base/model/menuModel.ts |  5 -----
 src/api/base/model/userModel.ts |  3 +++
 src/store/modules/permission.ts |  4 +---
 5 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 src/api/base/menu.ts

diff --git a/src/api/base/login.ts b/src/api/base/login.ts
index 6021c75..45d0498 100644
--- a/src/api/base/login.ts
+++ b/src/api/base/login.ts
@@ -8,7 +8,6 @@ enum Api {
   GetTenantIdByName = '/system/tenant/get-id-by-name?name=',
   LoginOut = '/system/auth/logout',
   GetUserInfo = '/system/auth/get-permission-info',
-  GetAsyncRoutes = '/system/auth/list-menus',
   GetCaptcha = '/system/captcha/get',
   CheckCaptcha = '/system/captcha/check'
 }
@@ -33,11 +32,6 @@ export function getUserInfo() {
   return defHttp.get({ url: Api.GetUserInfo })
 }
 
-// 路由
-export function getAsyncRoutes() {
-  return defHttp.get({ url: Api.GetAsyncRoutes })
-}
-
 // 获取登录验证码
 export function sendSmsCode(mobile, scene) {
   return defHttp.post({
diff --git a/src/api/base/menu.ts b/src/api/base/menu.ts
deleted file mode 100644
index 04e0954..0000000
--- a/src/api/base/menu.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { defHttp } from '@/utils/http/axios'
-import { getMenuListResultModel } from './model/menuModel'
-
-enum Api {
-  GetMenuList = '/system/auth/list-menus'
-}
-
-/**
- * @description: Get user menu based on id
- */
-
-export function getMenuList() {
-  return defHttp.get<getMenuListResultModel>({ url: Api.GetMenuList })
-}
diff --git a/src/api/base/model/menuModel.ts b/src/api/base/model/menuModel.ts
index 2d7789f..b042336 100644
--- a/src/api/base/model/menuModel.ts
+++ b/src/api/base/model/menuModel.ts
@@ -9,8 +9,3 @@ export interface RouteItem {
   caseSensitive?: boolean
   children?: RouteItem[]
 }
-
-/**
- * @description: Get menu return value
- */
-export type getMenuListResultModel = RouteItem[]
diff --git a/src/api/base/model/userModel.ts b/src/api/base/model/userModel.ts
index 527d14e..196ea85 100644
--- a/src/api/base/model/userModel.ts
+++ b/src/api/base/model/userModel.ts
@@ -1,3 +1,5 @@
+import { RouteItem } from './menuModel'
+
 /**
  * @description: Login interface parameters
  */
@@ -31,6 +33,7 @@ export interface LoginResultModel {
 export interface GetUserInfoModel {
   roles: string[]
   permissions: string[]
+  menus: RouteItem[]
   // 用户id
   user: userModel
 }
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index 98ba611..5fde697 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -16,7 +16,6 @@ import { useI18n } from '@/hooks/web/useI18n'
 import { useMessage } from '@/hooks/web/useMessage'
 import { filter } from '@/utils/helper/treeHelper'
 import projectSetting from '@/settings/projectSetting'
-import { getMenuList } from '@/api/base/menu'
 import { PageEnum } from '@/enums/pageEnum'
 import { PermissionModeEnum } from '@/enums/appEnum'
 
@@ -216,7 +215,7 @@ export const usePermissionStore = defineStore('app-permission', {
           // 这个功能可能只需要执行一次，实际项目可以自己放在合适的时间
           let routeList: AppRouteRecordRaw[] = []
           try {
-            routeList = (await getMenuList()) as AppRouteRecordRaw[]
+            routeList = userInfo.menus as AppRouteRecordRaw[]
           } catch (error) {
             console.error(error)
           }
@@ -233,7 +232,6 @@ export const usePermissionStore = defineStore('app-permission', {
           routeList = routeList.filter(routeRemoveIgnoreFilter)
           routeList = flatMultiLevelRoutes(routeList)
           routes = [PAGE_NOT_FOUND_ROUTE, dashboard, ...routeList, about]
-          console.info(routes)
           break
       }