1.去除白名单测试请求

2.修改当前菜单显示菜单（不包含功能）
3.修改网关url匹配问题

common/src/main/java/com/lantone/common/dto/GetMenuByIdDTO.java

@@ -37,7 +37,7 @@ public class GetMenuByIdDTO implements Serializable {
     @ApiModelProperty(value = "父类功能名称")
     private String parentName;
 
-    @ApiModelProperty(value = "类型：0:目录，1菜单，2按钮，3：超链接")
+    @ApiModelProperty(value = "类型：0:目录，1菜单，2按钮，3：功能")
     private String type;
 
     @ApiModelProperty(value = "页面路由")

common/src/main/java/com/lantone/common/dto/GetMenusTreeDTO.java

@@ -27,7 +27,7 @@ public class GetMenusTreeDTO implements Serializable {
     @ApiModelProperty(value = "功能名称")
     private String name;
 
-    @ApiModelProperty(value = "类型：0:目录，1菜单，2按钮，3：超链接")
+    @ApiModelProperty(value = "类型：0:目录，1菜单，2按钮，3：功能")
     private String type;
 
     @ApiModelProperty(value = "页面路由")

common/src/main/java/com/lantone/common/dto/GetUserShowTreeDTO.java

@@ -24,7 +24,7 @@ public class GetUserShowTreeDTO implements Serializable {
     private Long parentId;
     @ApiModelProperty(value = "菜单名称")
     private String menuName;
-    @ApiModelProperty(value = "类型：0:目录，1菜单，2按钮，3：超链接")
+    @ApiModelProperty(value = "类型：0:目录，1菜单，2按钮，3：功能")
     private String menuType ;
     @ApiModelProperty(value = "子集")
     private List<GetUserShowTreeDTO> sonMenu;

common/src/main/java/com/lantone/common/dto/MenuDTO.java

@@ -37,7 +37,7 @@ public class MenuDTO implements Serializable {
     @ApiModelProperty(value = "父类功能名称")
     private String parentName;
 
-    @ApiModelProperty(value = "类型：0:目录，1菜单，2按钮，3：超链接")
+    @ApiModelProperty(value = "类型：0:目录，1菜单，2按钮，3：功能")
     private String type;
 
     @ApiModelProperty(value = "页面路由")

common/src/main/java/com/lantone/common/dto/MenuInfoDTO.java

@@ -38,7 +38,7 @@ public class MenuInfoDTO {
     private String name;
 
     /**
-     * 类型：0:目录，1菜单，2按钮，3：超链接
+     * 类型：0:目录，1菜单，2按钮，3：功能
      */
     private String type;
 

common/src/main/java/com/lantone/common/dto/UserMenuResourceTreeDTO.java

@@ -32,7 +32,7 @@ public class UserMenuResourceTreeDTO implements Serializable {
 
     @ApiModelProperty(value = "是否关联")
     private String relation ;
-    @ApiModelProperty(value = "类型：0:目录，1菜单，2按钮，3：超链接")
+    @ApiModelProperty(value = "类型：0:目录，1菜单，2按钮，3：功能")
     private String menuType ;
 
     @ApiModelProperty(value = "子集")

common/src/main/java/com/lantone/common/vo/AddMenuVO.java

@@ -37,7 +37,7 @@ public class AddMenuVO implements Serializable {
     @ApiModelProperty(value = "权限标识")
     private List<String> permissions;
 
-    @ApiModelProperty(value = "类型：0:目录，1菜单，2按钮，3：超链接",required = true)
+    @ApiModelProperty(value = "类型：0:目录，1菜单，2按钮，3：功能",required = true)
     @NotBlank(message = "类型为空")
     private String type;
 

common/src/main/java/com/lantone/common/vo/UpdateMenuVO.java

@@ -40,7 +40,7 @@ public class UpdateMenuVO implements Serializable {
     @ApiModelProperty(value = "权限标识")
     private List<String> permissions;
 
-    @ApiModelProperty(value = "类型：0:目录，1菜单，2按钮，3：超链接",required = true)
+    @ApiModelProperty(value = "类型：0:目录，1菜单，2按钮，3：功能",required = true)
     @NotBlank(message = "类型为空")
     private String type;
 

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Menu.java

@@ -41,7 +41,7 @@ public class Menu implements Serializable {
     private String name;
 
     /**
-     * 类型：0:目录，1菜单，2按钮，3：超链接
+     * 类型：0:目录，1菜单，2按钮，3：功能
      */
     @TableField("type")
     private String type;

dblayer-mbg/src/main/resources/mapper/RoleSoftwareMenuMapper.xml

@@ -248,7 +248,7 @@
             sys_role r
         JOIN sys_role_software_menu rsm ON r.id = rsm.role_id
         JOIN sys_software_menu sm ON rsm.software_menu_id = sm.id
-        JOIN sys_menu m ON sm.menu_id = m.id
+        JOIN sys_menu m ON sm.menu_id = m.id AND m.type !=3
         WHERE
             r.is_deleted = 'N'
         AND rsm.is_deleted = 'N'

gateway-service/src/main/java/com/lantone/authorization/AuthorizationManager.java

@@ -76,7 +76,7 @@ public class AuthorizationManager implements ReactiveAuthorizationManager<Author
         List<String> authorities = new ArrayList<>();
         while (iterator.hasNext()) {
             String pattern = (String) iterator.next();
-            if (pathMatcher.match(pattern, uri.getPath())) {
+            if (pathMatcher.match(pattern.split("\\+")[0], uri.getPath())) {
                 authorities.addAll(Convert.toList(String.class, resourceRolesMap.get(pattern)));
             }
         }

gateway-service/src/main/resources/bootstrap.yml

@@ -81,40 +81,4 @@ secure:
       - "/actuator/**"
       - "/user-auth/oauth/token"
       - "/user-auth/rsa/publicKey"
-      - "/security-center/userManage/login"
-      - "/security-center/dataAuthManage/getDataAuthById"
-      - "/security-center/dataAuthManage/addAuth"
-      - "/security-center/dataAuthManage/updateAuth"
-      - "/security-center/dataAuthManage/disableAuth"
-      - "/security-center/dataAuthManage/deleteAuth"
-      - "/security-center/dataAuthManage/getDoctorPage"
-      - "/security-center/dataAuthManage/getDataAuthPage"
-      - "/security-center/funcManage/getMenus"
-      - "/security-center/funcManage/addMenu"
-      - "/security-center/funcManage/updateMenu"
-      - "/security-center/funcManage/deleteMenu"
-      - "/security-center/funcManage/disableMenu"
-      - "/security-center/funcManage/getMenuById"
-      - "/security-center/roleManage/addRole"
-      - "/security-center/roleManage/deleteRole"
-      - "/security-center/roleManage/disableRole"
-      - "/security-center/roleManage/getRoleById"
-      - "/security-center/roleManage/getRolePage"
-      - "/security-center/roleManage/updateRole"
-      - "/security-center/roleManage/getCreateRoles"
-      - "/security-center/roleManage/getUserShowMemuTree"
-      - "/security-center/roleManage/getUserMenuResourceTree"
-      - "/security-center/userManage/getHospitalTree"
-      - "/security-center/userManage/addUser"
-      - "/security-center/userManage/updateUser"
-      - "/security-center/userManage/deleteUser"
-      - "/security-center/userManage/disableUser"
-      - "/security-center/userManage/getUserById"
-      - "/security-center/userManage/getUserPage"
-      - "/security-center/hospitalManage/addHospital"
-      - "/security-center/hospitalManage/deleteHospital"
-      - "/security-center/hospitalManage/disableHospital"
-      - "/security-center/hospitalManage/getHospitalById"
-      - "/security-center/hospitalManage/getManagerBoxInfo"
-      - "/security-center/hospitalManage/getHospitalListInfo"
-      - "/security-center/dictionaryManage/getCodeCategory"
+      - "/security-center/userManage/login"

security-center/src/main/java/com/lantone/security/enums/MenuTypeEnum.java

@@ -9,9 +9,10 @@ import lombok.Setter;
  * @date 2018年11月21日 下午2:31:42
  */
 public enum MenuTypeEnum implements KeyedNamed {
-    MENU(0, "菜单"),
-    BUTTON(1, "按钮"),
-    LABEL(2, "标签");
+    MENU(0, "目录"),
+    BUTTON(1, "菜单"),
+    LABEL(2, "按钮"),
+    FUNCTION(3, "功能");
 
     @Setter
     private int key;

security-center/src/main/java/com/lantone/security/web/DataAuthManagementController.java

@@ -64,7 +64,7 @@ public class DataAuthManagementController {
         return CommonResult.success(dataAuthHandleFacade.deleteDataAuth(Id));
     }
 
-    @ApiOperation(value = "通过数据权限id和角色id获取数据权限详情[by:songxl]")
+    @ApiOperation(value = "查看数据权限[by:songxl]")
     @PostMapping("/getDataAuthById")
     public CommonResult<GetDataAuthByIdDTO> getDataAuthById(@RequestParam @Valid @NotNull(message = "数据权限id为空") Long Id) {
         return CommonResult.success(dataAuthHandleFacade.getDataAuthById(Id));

security-center/src/main/java/com/lantone/security/web/HospitalManagementController.java

@@ -4,7 +4,6 @@ package com.lantone.security.web;
 import com.lantone.common.api.CommonResult;
 import com.lantone.common.dto.GetHospitalByIdDTO;
 import com.lantone.common.dto.GetHospitalListInfoDTO;
-import com.lantone.common.dto.GetHospitalTreeDTO;
 import com.lantone.common.vo.AddHospitalVO;
 import com.lantone.common.vo.GetHospitalListInfoVO;
 import com.lantone.common.vo.UpdateHospitalVO;
@@ -62,7 +61,7 @@ public class HospitalManagementController {
         return CommonResult.success(hospitalManagementFacade.disableHospital(HospitalId,status));
     }
 
-    @ApiOperation(value = "通过组织id获取该组织及用户详情 [by:songxl]")
+    @ApiOperation(value = "查看功能 [by:songxl]")
     @PostMapping("/getHospitalById")
     public CommonResult<GetHospitalByIdDTO> getHospitalById(@RequestParam @Valid @NotNull(message = "组织编号为空") Long HospitalId, Long local) {
         return CommonResult.success(hospitalManagementFacade.getHospitalById(HospitalId,local));

security-center/src/main/java/com/lantone/security/web/RoleManagementController.java

@@ -75,13 +75,13 @@ public class RoleManagementController {
         return CommonResult.success(roleManagementFacade.disableRole(roleId, status));
     }
 
-    @ApiOperation(value = "通过角色id获取角色详情 [by:songxl]")
+    @ApiOperation(value = "查看功能 [by:songxl]")
     @PostMapping("/getRoleById")
     public CommonResult<GetRoleDTO> getRoleById(@RequestParam @Valid @NotNull(message = "角色编号为空") Long roleId) {
         return CommonResult.success(roleManagementFacade.getRoleById(roleId));
     }
 
-    @ApiOperation(value = "获取当前登录用户的功能权限树 [by:songxl]")
+    @ApiOperation(value = "获取当前登录用户管理的的功能权限树 [by:songxl]")
     @PostMapping("/getUserMenuResourceTree")
     public CommonResult<Map<Long, List<UserMenuResourceTreeDTO>>> getUserMenuResourceTree() {
         return CommonResult.success(roleManagementFacade.getUserMenuResourceTree());

security-center/src/main/java/com/lantone/security/web/UserManagementController.java

@@ -93,7 +93,7 @@ public class UserManagementController {
         return CommonResult.success(userManagementFacade.getUserById(userId));
     }
 
-    @ApiOperation(value = "获取登录用户的组织机构树 [by:songxl]")
+    @ApiOperation(value = "获取登录用户管理的组织机构树 [by:songxl]")
     @PostMapping("/getHospitalTree")
     public CommonResult<List<GetHospitalTreeDTO>> getLoginUserHospitalTree() {
         return CommonResult.success(userManagementFacade.getLoginUserHospitalTree());