diff --git a/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/entity/dto/SystemMenuDTO.java b/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/entity/dto/SystemMenuDTO.java index 71776802..3d70dba0 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/entity/dto/SystemMenuDTO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/entity/dto/SystemMenuDTO.java @@ -55,9 +55,6 @@ public class SystemMenuDTO implements Serializable { @Schema(description = "路由地址") private String path; - @Schema(description = "组件名称") - private String componentName; - @Schema(description = "组件地址") private String component; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.java index 5453beb7..4fc51375 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.java @@ -54,7 +54,7 @@ public class PermissionController { } @IgnoreLog(IgnoreLogMode.RET) - @GetMapping("/permission") + @GetMapping("/user") @Operation(summary = "获取用户权限") public UserPermissionVO getUserPermission() { return permissionService.getUserPermission(); diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemMenuController.http b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemMenuController.http index f69773ed..f6317077 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemMenuController.http +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemMenuController.http @@ -13,7 +13,6 @@ Authorization: {{token}} "cache": "", "icon": "", "path": "", - "componentName": "", "component": "" } @@ -34,7 +33,6 @@ Authorization: {{token}} "cache": "", "icon": "", "path": "", - "componentName": "", "component": "" } @@ -65,7 +63,6 @@ Authorization: {{token}} "cache": "", "icon": "", "path": "", - "componentName": "", "component": "" } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemMenuDAO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemMenuDAO.java index 80528fd2..34e90a17 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemMenuDAO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemMenuDAO.java @@ -33,7 +33,6 @@ public interface SystemMenuDAO extends IMapper { .eq(SystemMenuDO::getCache, entity.getCache()) .eq(SystemMenuDO::getIcon, entity.getIcon()) .eq(SystemMenuDO::getPath, entity.getPath()) - .eq(SystemMenuDO::getComponentName, entity.getComponentName()) .eq(SystemMenuDO::getComponent, entity.getComponent()); } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/domain/SystemMenuDO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/domain/SystemMenuDO.java index 5b9844a8..49d535a4 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/domain/SystemMenuDO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/domain/SystemMenuDO.java @@ -70,10 +70,6 @@ public class SystemMenuDO extends BaseDO { @TableField("path") private String path; - @Schema(description = "组件名称") - @TableField("component_name") - private String componentName; - @Schema(description = "组件地址") @TableField("component") private String component; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/dto/SystemMenuCacheDTO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/dto/SystemMenuCacheDTO.java index 4915cf23..e274ea05 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/dto/SystemMenuCacheDTO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/dto/SystemMenuCacheDTO.java @@ -32,6 +32,9 @@ public class SystemMenuCacheDTO { @Schema(description = "排序") private Integer sort; + @Schema(description = "是否可见 0不可见 1可见") + private Integer visible; + @Schema(description = "菜单状态 0停用 1启用") private Integer status; @@ -44,9 +47,6 @@ public class SystemMenuCacheDTO { @Schema(description = "路由地址") private String path; - @Schema(description = "组件名称") - private String componentName; - @Schema(description = "组件地址") private String component; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuCreateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuCreateRequest.java index d46d9c80..e37c8a4f 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuCreateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuCreateRequest.java @@ -64,16 +64,11 @@ public class SystemMenuCreateRequest implements Serializable { @Schema(description = "菜单图标") private String icon; - @Size(max = 128) + @Size(max = 256) @NotBlank @Schema(description = "路由地址") private String path; - @Size(max = 64) - @NotBlank - @Schema(description = "组件名称") - private String componentName; - @Size(max = 128) @NotBlank @Schema(description = "组件地址") diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuQueryRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuQueryRequest.java index 00401932..394b9f8e 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuQueryRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuQueryRequest.java @@ -54,14 +54,10 @@ public class SystemMenuQueryRequest extends PageRequest { @Schema(description = "菜单图标") private String icon; - @Size(max = 128) + @Size(max = 256) @Schema(description = "路由地址") private String path; - @Size(max = 64) - @Schema(description = "组件名称") - private String componentName; - @Size(max = 128) @Schema(description = "组件地址") private String component; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuUpdateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuUpdateRequest.java index e6612a8c..c715b449 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuUpdateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuUpdateRequest.java @@ -68,16 +68,11 @@ public class SystemMenuUpdateRequest implements Serializable { @Schema(description = "菜单图标") private String icon; - @Size(max = 128) + @Size(max = 256) @NotBlank @Schema(description = "路由地址") private String path; - @Size(max = 64) - @NotBlank - @Schema(description = "组件名称") - private String componentName; - @Size(max = 128) @NotBlank @Schema(description = "组件地址") diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuCreateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuCreateRequest.java index 2404ceb6..d0ec971c 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuCreateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuCreateRequest.java @@ -52,9 +52,6 @@ public class SystemMenuCreateRequest implements Serializable { @Schema(description = "路由地址") private String path; - @Schema(description = "组件名称") - private String componentName; - @Schema(description = "组件地址") private String component; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuUpdateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuUpdateRequest.java index 858565f9..edc32e93 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuUpdateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuUpdateRequest.java @@ -49,9 +49,6 @@ public class SystemMenuUpdateRequest implements Serializable { @Schema(description = "路由地址") private String path; - @Schema(description = "组件名称") - private String componentName; - @Schema(description = "组件地址") private String component; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuValidMenuRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuValidMenuRequest.java index 641f8140..156e82cd 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuValidMenuRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuValidMenuRequest.java @@ -55,16 +55,11 @@ public class SystemMenuValidMenuRequest implements Serializable { @Schema(description = "菜单图标") private String icon; - @Size(max = 128) + @Size(max = 256) @NotBlank @Schema(description = "路由地址") private String path; - @Size(max = 64) - @NotBlank - @Schema(description = "组件名称") - private String componentName; - @Size(max = 128) @NotBlank @Schema(description = "组件地址") diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/SystemMenuVO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/SystemMenuVO.java index de8b0b84..69c7e18c 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/SystemMenuVO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/SystemMenuVO.java @@ -58,9 +58,6 @@ public class SystemMenuVO implements Serializable { @Schema(description = "路由地址") private String path; - @Schema(description = "组件名称") - private String componentName; - @Schema(description = "组件地址") private String component; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemMenuMapper.xml b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemMenuMapper.xml index 2dd5ef5d..ea0d38b8 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemMenuMapper.xml +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemMenuMapper.xml @@ -20,13 +20,12 @@ - - create_time, update_time, creator, updater, deleted, id, parent_id, name, permission, type, sort, visible, status, cache, icon, path, component_name, component + create_time, update_time, creator, updater, deleted, id, parent_id, name, permission, type, sort, visible, status, cache, icon, path, component