From 6c60756e54be19258d7fd1a3cc520c66f7aa6c7d Mon Sep 17 00:00:00 2001 From: lijiahang Date: Mon, 26 Aug 2024 13:57:18 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E7=A6=81=E7=94=A8=20demo=20api.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/e2e/testsuite.yaml | 4 ++-- .../controller/AssetDataGrantServiceController.java | 4 ++++ .../module/asset/controller/ExecTemplateController.java | 5 +++++ .../module/infra/controller/SystemRoleController.java | 3 +++ .../module/infra/controller/SystemUserController.java | 3 +++ .../module/infra/service/impl/TagRelServiceImpl.java | 9 --------- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/docker/e2e/testsuite.yaml b/docker/e2e/testsuite.yaml index 8554d5e6..e35d3c2c 100644 --- a/docker/e2e/testsuite.yaml +++ b/docker/e2e/testsuite.yaml @@ -17,7 +17,7 @@ items: code: 200 - name: userPermission request: - api: /orion-visor/api/infra/permission/user + api: /orion-visor/api/infra/user-permission/user header: Authorization: Bearer {{.login.data.token}} expect: @@ -26,7 +26,7 @@ items: msg: "success" - name: menu request: - api: /orion-visor/api/infra/permission/menu + api: /orion-visor/api/infra/user-permission/menu header: Authorization: Bearer {{.login.data.token}} expect: diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetDataGrantServiceController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetDataGrantServiceController.java index f935335a..600c6041 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetDataGrantServiceController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetDataGrantServiceController.java @@ -3,6 +3,7 @@ package com.orion.visor.module.asset.controller; import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.visor.framework.log.core.annotation.IgnoreLog; import com.orion.visor.framework.log.core.enums.IgnoreLogMode; +import com.orion.visor.framework.web.core.annotation.DemoDisableApi; import com.orion.visor.framework.web.core.annotation.RestWrapper; import com.orion.visor.module.asset.define.operator.HostGroupOperatorType; import com.orion.visor.module.asset.define.operator.HostIdentityOperatorType; @@ -43,6 +44,7 @@ public class AssetDataGrantServiceController { @Resource private AssetAuthorizedDataService assetAuthorizedDataService; + @DemoDisableApi @OperatorLog(HostGroupOperatorType.GRANT) @PutMapping("/grant-host-group") @Operation(summary = "主机分组授权") @@ -60,6 +62,7 @@ public class AssetDataGrantServiceController { return assetAuthorizedDataService.getAuthorizedDataRelId(DataPermissionTypeEnum.HOST_GROUP, request); } + @DemoDisableApi @OperatorLog(HostKeyOperatorType.GRANT) @PutMapping("/grant-host-key") @Operation(summary = "主机密钥授权") @@ -77,6 +80,7 @@ public class AssetDataGrantServiceController { return assetAuthorizedDataService.getAuthorizedDataRelId(DataPermissionTypeEnum.HOST_KEY, request); } + @DemoDisableApi @OperatorLog(HostIdentityOperatorType.GRANT) @PutMapping("/grant-host-identity") @Operation(summary = "主机身份授权") diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecTemplateController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecTemplateController.java index d4aa49f4..6e58c6b6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecTemplateController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecTemplateController.java @@ -5,6 +5,7 @@ import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.visor.framework.common.validator.group.Page; import com.orion.visor.framework.log.core.annotation.IgnoreLog; import com.orion.visor.framework.log.core.enums.IgnoreLogMode; +import com.orion.visor.framework.web.core.annotation.DemoDisableApi; import com.orion.visor.framework.web.core.annotation.RestWrapper; import com.orion.visor.module.asset.define.operator.ExecTemplateOperatorType; import com.orion.visor.module.asset.entity.request.exec.ExecTemplateCreateRequest; @@ -41,6 +42,7 @@ public class ExecTemplateController { @Resource private ExecTemplateService execTemplateService; + @DemoDisableApi @OperatorLog(ExecTemplateOperatorType.CREATE) @PostMapping("/create") @Operation(summary = "创建执行模板") @@ -49,6 +51,7 @@ public class ExecTemplateController { return execTemplateService.createExecTemplate(request); } + @DemoDisableApi @OperatorLog(ExecTemplateOperatorType.UPDATE) @PutMapping("/update") @Operation(summary = "更新执行模板") @@ -83,6 +86,7 @@ public class ExecTemplateController { return execTemplateService.getExecTemplatePage(request); } + @DemoDisableApi @OperatorLog(ExecTemplateOperatorType.DELETE) @DeleteMapping("/delete") @Operation(summary = "删除执行模板") @@ -92,6 +96,7 @@ public class ExecTemplateController { return execTemplateService.deleteExecTemplateById(id); } + @DemoDisableApi @OperatorLog(ExecTemplateOperatorType.DELETE) @DeleteMapping("/batch-delete") @Operation(summary = "批量删除执行模板") diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemRoleController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemRoleController.java index 806be479..213c1a3e 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemRoleController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemRoleController.java @@ -48,6 +48,7 @@ public class SystemRoleController { @Resource private SystemRoleMenuService systemRoleMenuService; + @DemoDisableApi @OperatorLog(SystemRoleOperatorType.CREATE) @PostMapping("/create") @Operation(summary = "创建角色") @@ -56,6 +57,7 @@ public class SystemRoleController { return systemRoleService.createSystemRole(request); } + @DemoDisableApi @OperatorLog(SystemRoleOperatorType.UPDATE) @PutMapping("/update") @Operation(summary = "通过 id 更新角色") @@ -116,6 +118,7 @@ public class SystemRoleController { return systemRoleService.deleteSystemRoleById(id); } + @DemoDisableApi @OperatorLog(SystemRoleOperatorType.GRANT_MENU) @PutMapping("/grant-menu") @Operation(summary = "分配角色菜单") diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemUserController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemUserController.java index 7eeb31d4..1dd06e34 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemUserController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemUserController.java @@ -55,6 +55,7 @@ public class SystemUserController { @Resource private OperatorLogService operatorLogService; + @DemoDisableApi @OperatorLog(SystemUserOperatorType.CREATE) @PostMapping("/create") @Operation(summary = "创建用户") @@ -63,6 +64,7 @@ public class SystemUserController { return systemUserService.createSystemUser(request); } + @DemoDisableApi @OperatorLog(SystemUserOperatorType.UPDATE) @PutMapping("/update") @Operation(summary = "通过 id 更新用户") @@ -82,6 +84,7 @@ public class SystemUserController { return systemUserService.updateUserStatus(request); } + @DemoDisableApi @OperatorLog(SystemUserOperatorType.GRANT_ROLE) @PutMapping("/grant-role") @Operation(summary = "分配用户角色") diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/TagRelServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/TagRelServiceImpl.java index 6812baa9..9915cd16 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/TagRelServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/TagRelServiceImpl.java @@ -45,12 +45,6 @@ public class TagRelServiceImpl implements TagRelService { @Override public void addTagRel(String type, Long relId, List tagIdList) { - // 删除引用 - TagRelQueryRequest deleteRequest = new TagRelQueryRequest(); - deleteRequest.setTagType(type); - deleteRequest.setRelId(relId); - LambdaQueryWrapper deleteWrapper = this.buildQueryWrapper(deleteRequest); - tagRelDAO.delete(deleteWrapper); // 查询 tag List tagList = tagDAO.selectBatchIds(tagIdList); // 插入引用 @@ -63,9 +57,6 @@ public class TagRelServiceImpl implements TagRelService { .build()) .collect(Collectors.toList()); tagRelDAO.insertBatch(tagRelList); - // 设置缓存 - String cacheKey = TagCacheKeyDefine.TAG_REL.format(type, relId); - RedisStrings.setJson(cacheKey, TagCacheKeyDefine.TAG_REL, TagRelConvert.MAPPER.toCacheList(tagRelList)); } @Override