完善菜单栏

README.md

@@ -30,7 +30,11 @@
 网关项目，负责微服务接口转发，前端统一通过网关调用其他微服务接口；
 
 ### oms-api
-oms项目公用基础微服务，主要功能包括：用户登录、注销授权等；
+oms项目公用基础微服务，主要功能包括：
++ 用户
++ 授权
++ 菜单
++ 公共配置
 
 ### tao-api
 淘宝开放平台接口api

oms-api/src/main/java/com/qihang/oms/api/controller/MenusController.java

@@ -1,8 +1,12 @@
 package com.qihang.oms.api.controller;
 
+import com.alibaba.fastjson2.JSONArray;
 import com.qihang.oms.api.common.AjaxResult;
+import com.qihang.oms.api.domain.LoginUser;
 import com.qihang.oms.api.domain.vo.MenusDetailVo;
 import com.qihang.oms.api.domain.vo.MenusVo;
+import com.qihang.oms.api.service.TokenService;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -13,9 +17,15 @@ import java.util.List;
 @RequestMapping("/menus")
 @RestController
 public class MenusController {
+    private final TokenService tokenService;
+
+    public MenusController(TokenService tokenService) {
+        this.tokenService = tokenService;
+    }
 
     @GetMapping(value = "/routes")
-    public AjaxResult list() {
+    public AjaxResult list(HttpServletRequest request) {
+        LoginUser loginUser = tokenService.getLoginUser(request);
         List<MenusVo> vo = new ArrayList<>();
         MenusVo m1 = new MenusVo();
         m1.setPath("/system");
@@ -39,11 +49,104 @@ public class MenusController {
         meta11.setIcon("user");
         meta11.setHidden(false);
         meta11.setRoles(new String[]{"ADMIN", "GUEST"});
-        meta11.setKeepAlive(true);
+//        meta11.setKeepAlive(true);
         m1ch1.setMeta(meta11);
         m1Ch.add(m1ch1);
+
+
         m1.setChildren(m1Ch);
         vo.add(m1);
-        return AjaxResult.success(vo);
+        JSONArray jsonArray = JSONArray.parseArray("[{\n" +
+                "    \"path\": \"/system\",\n" +
+                "    \"component\": \"Layout\",\n" +
+                "    \"redirect\": \"/system/user\",\n" +
+                "    \"name\": \"/system\",\n" +
+                "    \"meta\": {\n" +
+                "        \"title\": \"系统管理\",\n" +
+                "        \"icon\": \"system\",\n" +
+                "        \"hidden\": false,\n" +
+                "        \"roles\": [\n" +
+                "            \"GUEST\",\n" +
+                "            \"ADMIN\",\n" +
+                "            \"ADMIN6\"\n" +
+                "        ]\n" +
+                "    },\n" +
+                "    \"children\": [\n" +
+                "        {\n" +
+                "            \"path\": \"user\",\n" +
+                "            \"component\": \"system/user/index\",\n" +
+                "            \"name\": \"User\",\n" +
+                "            \"meta\": {\n" +
+                "                \"title\": \"用户管理\",\n" +
+                "                \"icon\": \"user\",\n" +
+                "                \"hidden\": false,\n" +
+                "                \"roles\": [\n" +
+                "                    \"ADMIN\",\n" +
+                "                    \"GUEST\"\n" +
+                "                ],\n" +
+                "                \"keepAlive\": true\n" +
+                "            }\n" +
+                "        },\n" +
+                "        {\n" +
+                "            \"path\": \"role\",\n" +
+                "            \"component\": \"system/role/index\",\n" +
+                "            \"name\": \"Role\",\n" +
+                "            \"meta\": {\n" +
+                "                \"title\": \"角色管理\",\n" +
+                "                \"icon\": \"role\",\n" +
+                "                \"hidden\": false,\n" +
+                "                \"roles\": [\n" +
+                "                    \"ADMIN\",\n" +
+                "                    \"ADMIN6\",\n" +
+                "                    \"GUEST\"\n" +
+                "                ],\n" +
+                "                \"keepAlive\": true\n" +
+                "            }\n" +
+                "        },\n" +
+                "        {\n" +
+                "            \"path\": \"menu\",\n" +
+                "            \"component\": \"system/menu/index\",\n" +
+                "            \"name\": \"Menu\",\n" +
+                "            \"meta\": {\n" +
+                "                \"title\": \"菜单管理\",\n" +
+                "                \"icon\": \"menu\",\n" +
+                "                \"hidden\": false,\n" +
+                "                \"roles\": [\n" +
+                "                    \"ADMIN\"\n" +
+                "                ],\n" +
+                "                \"keepAlive\": true\n" +
+                "            }\n" +
+                "        },\n" +
+                "        {\n" +
+                "            \"path\": \"dept\",\n" +
+                "            \"component\": \"system/dept/index\",\n" +
+                "            \"name\": \"Dept\",\n" +
+                "            \"meta\": {\n" +
+                "                \"title\": \"部门管理\",\n" +
+                "                \"icon\": \"tree\",\n" +
+                "                \"hidden\": false,\n" +
+                "                \"roles\": [\n" +
+                "                    \"ADMIN\"\n" +
+                "                ],\n" +
+                "                \"keepAlive\": true\n" +
+                "            }\n" +
+                "        },\n" +
+                "        {\n" +
+                "            \"path\": \"dict\",\n" +
+                "            \"component\": \"system/dict/index\",\n" +
+                "            \"name\": \"Dict\",\n" +
+                "            \"meta\": {\n" +
+                "                \"title\": \"字典管理\",\n" +
+                "                \"icon\": \"dict\",\n" +
+                "                \"hidden\": false,\n" +
+                "                \"roles\": [\n" +
+                "                    \"ADMIN\"\n" +
+                "                ],\n" +
+                "                \"keepAlive\": true\n" +
+                "            }\n" +
+                "        }\n" +
+                "    ]\n" +
+                "}]");
+        return AjaxResult.success(jsonArray);
     }
 }

oms-api/src/main/java/com/qihang/oms/api/domain/vo/MenusDetailVo.java

@@ -7,7 +7,7 @@ public class MenusDetailVo {
     private String icon;
     private Boolean hidden;
     private String[] roles;
-    private Boolean keepAlive;
+//    private Boolean keepAlive;
 
     public String getTitle() {
         return title;
@@ -41,11 +41,11 @@ public class MenusDetailVo {
         this.roles = roles;
     }
 
-    public Boolean getKeepAlive() {
+//    public Boolean getKeepAlive() {
-        return keepAlive;
+//        return keepAlive;
-    }
+//    }
-
+//
-    public void setKeepAlive(Boolean keepAlive) {
+//    public void setKeepAlive(Boolean keepAlive) {
-        this.keepAlive = keepAlive;
+//        this.keepAlive = keepAlive;
-    }
+//    }
 }