From 42f1c6f0cb354a56336b1999ad45705cea8680eb Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Wed, 8 May 2024 21:01:57 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BF=AE=E6=94=B9=E7=A9=BA=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=E7=B1=BB=E5=9E=8B.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetDataGrantServiceController.java | 13 ++++---- .../controller/ExecCommandLogController.java | 13 ++++---- .../asset/controller/ExecJobController.java | 5 ++- .../controller/ExecJobLogController.java | 9 +++--- .../asset/controller/HostGroupController.java | 5 ++- .../controller/UploadTaskController.http | 31 +++++++++++++++++-- .../controller/UploadTaskController.java | 9 +++--- .../upload/UploadTaskCreateRequest.java | 2 ++ .../request/upload/UploadTaskFileRequest.java | 2 +- .../controller/AuthenticationController.java | 5 ++- .../infra/controller/DictKeyController.java | 5 ++- .../infra/controller/MineController.java | 9 +++--- .../controller/PermissionController.java | 5 ++- .../controller/PreferenceController.java | 5 ++- .../controller/SystemUserController.java | 9 +++--- .../infra/entity/dto/DictKeyCacheDTO.java | 1 - .../favorite/FavoriteQueryRequest.java | 2 -- .../ops/module/infra/entity/vo/DictKeyVO.java | 1 - .../module/infra/entity/vo/SystemRoleVO.java | 9 ++++-- .../infra/service/DataPermissionService.java | 1 - 20 files changed, 78 insertions(+), 63 deletions(-) diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/AssetDataGrantServiceController.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/AssetDataGrantServiceController.java index 456f596a..b9eb9b26 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/AssetDataGrantServiceController.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/AssetDataGrantServiceController.java @@ -1,6 +1,5 @@ package com.orion.ops.module.asset.controller; -import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.ops.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.ops.framework.log.core.annotation.IgnoreLog; import com.orion.ops.framework.log.core.enums.IgnoreLogMode; @@ -48,9 +47,9 @@ public class AssetDataGrantServiceController { @PutMapping("/grant-host-group") @Operation(summary = "主机分组授权") @PreAuthorize("@ss.hasPermission('asset:host-group:grant')") - public HttpWrapper grantHostGroup(@RequestBody AssetDataGrantRequest request) { + public Boolean grantHostGroup(@RequestBody AssetDataGrantRequest request) { assetDataGrantService.grantHostGroup(request); - return HttpWrapper.ok(); + return true; } @IgnoreLog(IgnoreLogMode.RET) @@ -65,9 +64,9 @@ public class AssetDataGrantServiceController { @PutMapping("/grant-host-key") @Operation(summary = "主机秘钥授权") @PreAuthorize("@ss.hasPermission('asset:host-key:grant')") - public HttpWrapper grantHostKey(@RequestBody AssetDataGrantRequest request) { + public Boolean grantHostKey(@RequestBody AssetDataGrantRequest request) { assetDataGrantService.grantHostKey(request); - return HttpWrapper.ok(); + return true; } @IgnoreLog(IgnoreLogMode.RET) @@ -82,9 +81,9 @@ public class AssetDataGrantServiceController { @PutMapping("/grant-host-identity") @Operation(summary = "主机身份授权") @PreAuthorize("@ss.hasPermission('asset:host-identity:grant')") - public HttpWrapper grantHostIdentity(@RequestBody AssetDataGrantRequest request) { + public Boolean grantHostIdentity(@RequestBody AssetDataGrantRequest request) { assetDataGrantService.grantHostIdentity(request); - return HttpWrapper.ok(); + return true; } @IgnoreLog(IgnoreLogMode.RET) diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecCommandLogController.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecCommandLogController.java index 1b82830e..f6410967 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecCommandLogController.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecCommandLogController.java @@ -1,7 +1,6 @@ package com.orion.ops.module.asset.controller; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.ops.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.ops.framework.common.utils.Valid; import com.orion.ops.framework.common.validator.group.Page; @@ -159,24 +158,24 @@ public class ExecCommandLogController { execLogService.downloadLogFile(id, SOURCE, response); } - @OperatorLog(ExecCommandLogOperatorType.INTERRUPT) + @OperatorLog(value = ExecCommandLogOperatorType.INTERRUPT) @PutMapping("/interrupt") @Operation(summary = "中断批量执行命令") @PreAuthorize("@ss.hasPermission('asset:exec-command-log:interrupt')") - public HttpWrapper interruptExecCommand(@RequestBody ExecInterruptRequest request) { + public Boolean interruptExecCommand(@RequestBody ExecInterruptRequest request) { Long logId = Valid.notNull(request.getLogId()); execLogService.interruptExec(logId, SOURCE); - return HttpWrapper.ok(); + return true; } - @OperatorLog(ExecCommandLogOperatorType.INTERRUPT_HOST) + @OperatorLog(value = ExecCommandLogOperatorType.INTERRUPT_HOST) @PutMapping("/interrupt-host") @Operation(summary = "中断批量执行主机命令") @PreAuthorize("@ss.hasPermission('asset:exec-command-log:interrupt')") - public HttpWrapper interruptHostExecCommand(@RequestBody ExecInterruptRequest request) { + public Boolean interruptHostExecCommand(@RequestBody ExecInterruptRequest request) { Long hostLogId = Valid.notNull(request.getHostLogId()); execLogService.interruptHostExec(hostLogId, SOURCE); - return HttpWrapper.ok(); + return true; } } diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobController.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobController.java index ea012df0..fb640773 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobController.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobController.java @@ -1,7 +1,6 @@ package com.orion.ops.module.asset.controller; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.ops.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.ops.framework.common.validator.group.Page; import com.orion.ops.framework.log.core.annotation.IgnoreLog; @@ -103,9 +102,9 @@ public class ExecJobController { @PostMapping("/trigger") @Operation(summary = "手动触发计划任务") @PreAuthorize("@ss.hasPermission('asset:exec-job:trigger')") - public HttpWrapper triggerExecJob(@Validated @RequestBody ExecJobTriggerRequest request) { + public Boolean triggerExecJob(@Validated @RequestBody ExecJobTriggerRequest request) { execJobService.manualTriggerExecJob(request.getId()); - return HttpWrapper.ok(); + return true; } } diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobLogController.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobLogController.java index 23289c1c..cf9019ba 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobLogController.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobLogController.java @@ -1,7 +1,6 @@ package com.orion.ops.module.asset.controller; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.ops.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.ops.framework.common.utils.Valid; import com.orion.ops.framework.common.validator.group.Page; @@ -152,20 +151,20 @@ public class ExecJobLogController { @PutMapping("/interrupt") @Operation(summary = "中断计划任务命令") @PreAuthorize("@ss.hasPermission('asset:exec-job-log:interrupt')") - public HttpWrapper interruptExecCommand(@RequestBody ExecInterruptRequest request) { + public Boolean interruptExecCommand(@RequestBody ExecInterruptRequest request) { Long logId = Valid.notNull(request.getLogId()); execLogService.interruptExec(logId, SOURCE); - return HttpWrapper.ok(); + return true; } @OperatorLog(ExecJobLogOperatorType.INTERRUPT_HOST) @PutMapping("/interrupt-host") @Operation(summary = "中断计划任务主机命令") @PreAuthorize("@ss.hasPermission('asset:exec-job-log:interrupt')") - public HttpWrapper interruptHostExecCommand(@RequestBody ExecInterruptRequest request) { + public Boolean interruptHostExecCommand(@RequestBody ExecInterruptRequest request) { Long hostLogId = Valid.notNull(request.getHostLogId()); execLogService.interruptHostExec(hostLogId, SOURCE); - return HttpWrapper.ok(); + return true; } } diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostGroupController.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostGroupController.java index 918aac7c..ee2ed26b 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostGroupController.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostGroupController.java @@ -1,6 +1,5 @@ package com.orion.ops.module.asset.controller; -import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.ops.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.ops.framework.log.core.annotation.IgnoreLog; import com.orion.ops.framework.log.core.enums.IgnoreLogMode; @@ -96,9 +95,9 @@ public class HostGroupController { @PutMapping("/update-rel") @Operation(summary = "修改分组内主机") @PreAuthorize("@ss.hasPermission('asset:host-group:update')") - public HttpWrapper updateHostGroupRel(@Validated @RequestBody HostGroupRelUpdateRequest request) { + public Boolean updateHostGroupRel(@Validated @RequestBody HostGroupRelUpdateRequest request) { hostGroupService.updateHostGroupRel(request); - return HttpWrapper.ok(); + return true; } } diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/UploadTaskController.http b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/UploadTaskController.http index 6097a093..8013eb5c 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/UploadTaskController.http +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/UploadTaskController.http @@ -4,8 +4,35 @@ Content-Type: application/json Authorization: {{token}} { - "remotePath": "", - "description": "" + "remotePath": "/root/batch", + "description": "", + "hostIdList": [ + 1, + 7, + 8 + ], + "files": [ + { + "fileId": "1", + "filePath": "qr.txt", + "fileSize": 3 + }, + { + "fileId": "2", + "filePath": "dir/key.txt", + "fileSize": 3 + } + ] +} + + +### 开始上传 +POST {{baseUrl}}/asset/upload-task/start +Content-Type: application/json +Authorization: {{token}} + +{ + "id": 1 } diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/UploadTaskController.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/UploadTaskController.java index 3dd10a5f..b5ad16a7 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/UploadTaskController.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/UploadTaskController.java @@ -1,7 +1,6 @@ package com.orion.ops.module.asset.controller; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.ops.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.ops.framework.common.validator.group.Page; import com.orion.ops.framework.log.core.annotation.IgnoreLog; @@ -57,18 +56,18 @@ public class UploadTaskController { @PostMapping("/start") @Operation(summary = "开始上传") @PreAuthorize("@ss.hasPermission('asset:upload-task:upload')") - public HttpWrapper startUploadTask(@Validated @RequestBody UploadTaskRequest request) { + public Boolean startUploadTask(@Validated @RequestBody UploadTaskRequest request) { uploadTaskService.startUploadTask(request.getId()); - return HttpWrapper.ok(); + return true; } @OperatorLog(UploadTaskOperatorType.CANCEL) @PostMapping("/cancel") @Operation(summary = "取消上传") @PreAuthorize("@ss.hasPermission('asset:upload-task:upload')") - public HttpWrapper cancelUploadTask(@Validated @RequestBody UploadTaskRequest request) { + public Boolean cancelUploadTask(@Validated @RequestBody UploadTaskRequest request) { uploadTaskService.cancelUploadTask(request.getId()); - return HttpWrapper.ok(); + return true; } @IgnoreLog(IgnoreLogMode.RET) diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/upload/UploadTaskCreateRequest.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/upload/UploadTaskCreateRequest.java index c0e4adb6..265e2df2 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/upload/UploadTaskCreateRequest.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/upload/UploadTaskCreateRequest.java @@ -6,6 +6,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.Valid; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.Size; @@ -41,6 +42,7 @@ public class UploadTaskCreateRequest implements Serializable { @Schema(description = "上传主机id") private List hostIdList; + @Valid @NotEmpty @Schema(description = "上传文件") private List files; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/upload/UploadTaskFileRequest.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/upload/UploadTaskFileRequest.java index 1e042034..3527f3cf 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/upload/UploadTaskFileRequest.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/upload/UploadTaskFileRequest.java @@ -35,7 +35,7 @@ public class UploadTaskFileRequest implements Serializable { private String filePath; @NotNull - @Schema(description = "文件发小") + @Schema(description = "文件大小") private Long fileSize; } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/AuthenticationController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/AuthenticationController.java index 96ed4cc7..1038e7d3 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/AuthenticationController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/AuthenticationController.java @@ -1,6 +1,5 @@ package com.orion.ops.module.infra.controller; -import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.ops.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.ops.framework.log.core.annotation.IgnoreLog; import com.orion.ops.framework.log.core.enums.IgnoreLogMode; @@ -52,9 +51,9 @@ public class AuthenticationController { @IgnoreLog(IgnoreLogMode.RET) @Operation(summary = "登出") @GetMapping("/logout") - public HttpWrapper logout(HttpServletRequest servletRequest) { + public Boolean logout(HttpServletRequest servletRequest) { authenticationService.logout(servletRequest); - return HttpWrapper.ok(); + return true; } } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/DictKeyController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/DictKeyController.java index 27a8353b..716a473e 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/DictKeyController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/DictKeyController.java @@ -1,7 +1,6 @@ package com.orion.ops.module.infra.controller; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.ops.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.ops.framework.log.core.annotation.IgnoreLog; import com.orion.ops.framework.log.core.enums.IgnoreLogMode; @@ -76,9 +75,9 @@ public class DictKeyController { @PutMapping("/refresh-cache") @Operation(summary = "刷新字典缓存") @PreAuthorize("@ss.hasPermission('infra:dict-key:management:refresh-cache')") - public HttpWrapper refreshCache() { + public Boolean refreshCache() { dictKeyService.refreshCache(); - return HttpWrapper.ok(); + return true; } @OperatorLog(DictKeyOperatorType.DELETE) diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/MineController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/MineController.java index 6123615e..e4ee3341 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/MineController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/MineController.java @@ -1,7 +1,6 @@ package com.orion.ops.module.infra.controller; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.ops.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.ops.framework.common.validator.group.Page; import com.orion.ops.framework.log.core.annotation.IgnoreLog; @@ -61,9 +60,9 @@ public class MineController { @OperatorLog(AuthenticationOperatorType.UPDATE_PASSWORD) @Operation(summary = "修改当前用户密码") @PutMapping("/update-password") - public HttpWrapper updateCurrentUserPassword(@Validated @RequestBody UserUpdatePasswordRequest request) { + public Boolean updateCurrentUserPassword(@Validated @RequestBody UserUpdatePasswordRequest request) { mineService.updateCurrentUserPassword(request); - return HttpWrapper.ok(); + return true; } @IgnoreLog(IgnoreLogMode.RET) @@ -82,9 +81,9 @@ public class MineController { @PutMapping("/offline-session") @Operation(summary = "下线当前用户会话") - public HttpWrapper offlineCurrentUserSession(@Validated @RequestBody UserSessionOfflineRequest request) { + public Boolean offlineCurrentUserSession(@Validated @RequestBody UserSessionOfflineRequest request) { mineService.offlineCurrentUserSession(request); - return HttpWrapper.ok(); + return true; } @IgnoreLog(IgnoreLogMode.RET) 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 fce01c9f..cae44d6c 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 @@ -1,6 +1,5 @@ package com.orion.ops.module.infra.controller; -import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.ops.framework.log.core.annotation.IgnoreLog; import com.orion.ops.framework.log.core.enums.IgnoreLogMode; import com.orion.ops.framework.web.core.annotation.RestWrapper; @@ -42,9 +41,9 @@ public class PermissionController { @PutMapping("/refresh-cache") @Operation(summary = "刷新角色权限缓存") @PreAuthorize("@ss.hasPermission('infra:system-menu:management:refresh-cache')") - public HttpWrapper refreshCache() { + public Boolean refreshCache() { permissionService.initPermissionCache(); - return HttpWrapper.ok(); + return true; } @IgnoreLog(IgnoreLogMode.RET) diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PreferenceController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PreferenceController.java index bdf64047..536dfd88 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PreferenceController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PreferenceController.java @@ -1,6 +1,5 @@ package com.orion.ops.module.infra.controller; -import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.ops.framework.web.core.annotation.RestWrapper; import com.orion.ops.module.infra.entity.request.preference.PreferenceUpdatePartialRequest; import com.orion.ops.module.infra.entity.request.preference.PreferenceUpdateRequest; @@ -43,9 +42,9 @@ public class PreferenceController { @PutMapping("/update-partial") @Operation(summary = "更新用户偏好-部分") - public HttpWrapper updatePreferencePartial(@Validated @RequestBody PreferenceUpdatePartialRequest request) { + public Boolean updatePreferencePartial(@Validated @RequestBody PreferenceUpdatePartialRequest request) { preferenceService.updatePreferencePartial(request); - return HttpWrapper.ok(); + return true; } @GetMapping("/get") diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserController.java index 7f89be81..ad7b9211 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserController.java @@ -1,7 +1,6 @@ package com.orion.ops.module.infra.controller; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.utils.collect.Lists; import com.orion.ops.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.ops.framework.common.validator.group.Page; @@ -100,9 +99,9 @@ public class SystemUserController { @PutMapping("/reset-password") @Operation(summary = "重置用户密码") @PreAuthorize("@ss.hasPermission('infra:system-user:management:reset-password')") - public HttpWrapper resetUserPassword(@Validated @RequestBody UserResetPasswordRequest request) { + public Boolean resetUserPassword(@Validated @RequestBody UserResetPasswordRequest request) { systemUserService.resetPassword(request); - return HttpWrapper.ok(); + return true; } @IgnoreLog(IgnoreLogMode.RET) @@ -159,9 +158,9 @@ public class SystemUserController { @PutMapping("/session/offline") @Operation(summary = "下线用户会话") @PreAuthorize("@ss.hasPermission('infra:system-user:management:offline-session')") - public HttpWrapper offlineUserSession(@Validated @RequestBody UserSessionOfflineRequest request) { + public Boolean offlineUserSession(@Validated @RequestBody UserSessionOfflineRequest request) { systemUserManagementService.offlineUserSession(request); - return HttpWrapper.ok(); + return true; } @IgnoreLog(IgnoreLogMode.RET) diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/dto/DictKeyCacheDTO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/dto/DictKeyCacheDTO.java index a7b26194..b42e22dd 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/dto/DictKeyCacheDTO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/dto/DictKeyCacheDTO.java @@ -8,7 +8,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; -import java.util.Date; /** * 字典配置项 缓存对象 diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/favorite/FavoriteQueryRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/favorite/FavoriteQueryRequest.java index 098ea0df..14cdf06b 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/favorite/FavoriteQueryRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/favorite/FavoriteQueryRequest.java @@ -4,8 +4,6 @@ import com.orion.ops.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.List; - /** * 收藏 查询请求对象 * diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/DictKeyVO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/DictKeyVO.java index 204540e5..c7753d53 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/DictKeyVO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/DictKeyVO.java @@ -7,7 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; -import java.util.Date; /** * 字典配置项 视图响应对象 diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/SystemRoleVO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/SystemRoleVO.java index 900b799d..a2d726b9 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/SystemRoleVO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/vo/SystemRoleVO.java @@ -1,10 +1,13 @@ package com.orion.ops.module.infra.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; -import java.io.Serializable; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; -import java.util.*; +import java.io.Serializable; +import java.util.Date; /** * 角色 视图响应对象 diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/DataPermissionService.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/DataPermissionService.java index a0ce7bd1..f06d085b 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/DataPermissionService.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/DataPermissionService.java @@ -1,7 +1,6 @@ package com.orion.ops.module.infra.service; import com.orion.ops.module.infra.entity.request.data.DataPermissionUpdateRequest; -import com.orion.ops.module.infra.enums.DataPermissionTypeEnum; import java.util.List;