diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationController.java b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationController.java index 6ef716ca40..97eae20183 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationController.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationController.java @@ -30,7 +30,7 @@ import java.util.List; /** * @author guoyuqi */ -@Tag(name = "组织-成员") +@Tag(name = "系统设置-组织-成员") @RestController @RequestMapping("/organization") public class OrganizationController { @@ -39,7 +39,7 @@ public class OrganizationController { private OrganizationService organizationService; @PostMapping("/member/list") - @Operation(summary = "组织级别获取组织成员") + @Operation(summary = "系统设置-组织-成员-获取组织成员列表") @RequiresPermissions(PermissionConstants.ORGANIZATION_MEMBER_READ) public Pager> getMemberList(@Validated @RequestBody OrganizationRequest organizationRequest) { Page page = PageHelper.startPage(organizationRequest.getCurrent(), organizationRequest.getPageSize()); @@ -47,35 +47,35 @@ public class OrganizationController { } @PostMapping("/add-member") - @Operation(summary = "添加组织成员") + @Operation(summary = "系统设置-组织-成员-添加组织成员") @RequiresPermissions(PermissionConstants.ORGANIZATION_MEMBER_ADD) public void addMemberByList(@Validated @RequestBody OrganizationMemberExtendRequest organizationMemberExtendRequest) { organizationService.addMemberByOrg(organizationMemberExtendRequest, SessionUtils.getUserId()); } @PostMapping("/role/update-member") - @Operation(summary = "添加组织成员至用户组") + @Operation(summary = "系统设置-组织-成员-添加组织成员至用户组") @RequiresPermissions(PermissionConstants.ORGANIZATION_MEMBER_UPDATE) public void addMemberRole(@Validated @RequestBody OrganizationMemberExtendRequest organizationMemberExtendRequest) { organizationService.addMemberRole(organizationMemberExtendRequest, SessionUtils.getUserId()); } @PostMapping("/update-member") - @Operation(summary = "更新用户") + @Operation(summary = "系统设置-组织-成员-更新用户") @RequiresPermissions(value = {PermissionConstants.ORGANIZATION_MEMBER_UPDATE, PermissionConstants.PROJECT_USER_READ_ADD, PermissionConstants.PROJECT_USER_READ_DELETE}, logical = Logical.OR) public void updateMember(@Validated @RequestBody OrganizationMemberUpdateRequest organizationMemberExtendRequest) { organizationService.updateMember(organizationMemberExtendRequest, SessionUtils.getUserId()); } @PostMapping("/project/add-member") - @Operation(summary = "添加组织成员至项目") + @Operation(summary = "系统设置-组织-成员-添加组织成员至项目") @RequiresPermissions(value = {PermissionConstants.ORGANIZATION_MEMBER_UPDATE, PermissionConstants.PROJECT_USER_READ_ADD}) public void addMemberToProject(@Validated @RequestBody OrgMemberExtendProjectRequest orgMemberExtendProjectRequest) { organizationService.addMemberToProject(orgMemberExtendProjectRequest, SessionUtils.getUserId()); } @GetMapping("/remove-member/{organizationId}/{userId}") - @Operation(summary = "删除组织成员") + @Operation(summary = "系统设置-组织-成员-删除组织成员") @Parameters({ @Parameter(name = "organizationId", description = "组织ID", schema = @Schema(requiredMode = Schema.RequiredMode.REQUIRED)), @Parameter(name = "userId", description = "成员ID", schema = @Schema(requiredMode = Schema.RequiredMode.REQUIRED)) @@ -87,21 +87,21 @@ public class OrganizationController { } @GetMapping("/project/list/{organizationId}") - @Operation(summary = "获取当前组织下的所有项目") + @Operation(summary = "系统设置-组织-成员-获取当前组织下的所有项目") @RequiresPermissions(PermissionConstants.ORGANIZATION_PROJECT_READ) public List getProjectList(@PathVariable(value = "organizationId") String organizationId) { return organizationService.getProjectList(organizationId); } @GetMapping("/user/role/list/{organizationId}") - @Operation(summary = "获取当前组织下的所有自定义用户组以及组织级别的用户组") + @Operation(summary = "系统设置-组织-成员-获取当前组织下的所有自定义用户组以及组织级别的用户组") @RequiresPermissions(PermissionConstants.ORGANIZATION_MEMBER_READ) public List getUserRoleList(@PathVariable(value = "organizationId") String organizationId) { return organizationService.getUserRoleList(organizationId); } @GetMapping("/not-exist/user/list/{organizationId}") - @Operation(summary = "获取不在当前组织的所有用户") + @Operation(summary = "系统设置-组织-成员-获取不在当前组织的所有用户") @RequiresPermissions(PermissionConstants.SYSTEM_USER_ROLE_READ) public List getUserList(@PathVariable(value = "organizationId") String organizationId) { return organizationService.getUserList(organizationId); diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/TestResourcePoolController.java b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/TestResourcePoolController.java index c7e9a702e7..dae5d49390 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/TestResourcePoolController.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/TestResourcePoolController.java @@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Tag(name = "系统资源池") +@Tag(name = "系统设置-系统-资源池") @RequestMapping("/test/resource/pool") @RestController public class TestResourcePoolController { @@ -36,7 +36,7 @@ public class TestResourcePoolController { private TestResourcePoolService testResourcePoolService; @PostMapping("/add") - @Operation(summary = "添加资源池") + @Operation(summary = "系统设置-系统-资源池-添加资源池") @RequiresPermissions(PermissionConstants.SYSTEM_TEST_RESOURCE_POOL_READ_ADD) @Log(type = OperationLogType.ADD, expression = "#msClass.addLog(#request)", msClass = TestResourcePoolService.class) public TestResourcePool addTestResourcePool(@Validated({Created.class}) @RequestBody TestResourcePoolRequest request) { @@ -50,7 +50,7 @@ public class TestResourcePoolController { @GetMapping("/delete/{poolId}") @CacheNode // 把监控节点缓存起来 - @Operation(summary = "删除资源池") + @Operation(summary = "系统设置-系统-资源池-删除资源池") @RequiresPermissions(PermissionConstants.SYSTEM_TEST_RESOURCE_POOL_READ_DELETE) @Log(type = OperationLogType.DELETE, expression = "#msClass.deleteLog(#testResourcePoolId)", msClass = TestResourcePoolService.class) public void deleteTestResourcePool(@PathVariable(value = "poolId") String testResourcePoolId) { @@ -59,7 +59,7 @@ public class TestResourcePoolController { @PostMapping("/update") @CacheNode // 把监控节点缓存起来 - @Operation(summary = "更新资源池") + @Operation(summary = "系统设置-系统-资源池-更新资源池") @RequiresPermissions(PermissionConstants.SYSTEM_TEST_RESOURCE_POOL_READ_UPDATE) @Log(type = OperationLogType.UPDATE, expression = "#msClass.updateLog(#request.getId())", msClass = TestResourcePoolService.class) public void updateTestResourcePool(@Validated({Updated.class}) @RequestBody TestResourcePoolRequest request) { @@ -71,7 +71,7 @@ public class TestResourcePoolController { } @PostMapping("/page") - @Operation(summary = "获取资源池列表") + @Operation(summary = "系统设置-系统-资源池-获取资源池列表") @RequiresPermissions(PermissionConstants.SYSTEM_TEST_RESOURCE_POOL_READ) public Pager> listResourcePools(@Validated @RequestBody QueryResourcePoolRequest request) { Page page = PageHelper.startPage(request.getCurrent(), request.getPageSize(), true); @@ -79,14 +79,14 @@ public class TestResourcePoolController { } @GetMapping("/detail/{poolId}") - @Operation(summary = "查看资源池详细") + @Operation(summary = "系统-资源池-查看资源池详细") @RequiresPermissions(PermissionConstants.SYSTEM_TEST_RESOURCE_POOL_READ) public TestResourcePoolReturnDTO getTestResourcePoolDetail(@PathVariable(value = "poolId") String testResourcePoolId) { return testResourcePoolService.getTestResourcePoolDetail(testResourcePoolId); } @PostMapping("/set/enable/{poolId}") - @Operation(summary = "资源池禁用") + @Operation(summary = "系统设置-系统-资源池-资源池禁用") @RequiresPermissions(PermissionConstants.SYSTEM_TEST_RESOURCE_POOL_READ_UPDATE) @Log(type = OperationLogType.UPDATE, expression = "#msClass.updateLog(#testResourcePoolId)", msClass = TestResourcePoolService.class) public void unableTestResourcePool(@PathVariable(value = "poolId") String testResourcePoolId) {