manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

⚡ 修改空返回值类型.

Browse Source
This commit is contained in:
lijiahangmax
2024-05-08 21:01:57 +08:00
parent 26172ea651
commit 42f1c6f0cb
20 changed files with 78 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/AssetDataGrantServiceController.java
View File

@@ -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)

13
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecCommandLogController.java
View File

@@ -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;
}
}

5
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobController.java
View File

@@ -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;
}
}

9
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobLogController.java
View File

@@ -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;
}
}

5
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostGroupController.java
View File

@@ -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;
}
}

31
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/UploadTaskController.http
View File

@@ -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
}

9
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/UploadTaskController.java
View File

@@ -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)

2
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/upload/UploadTaskCreateRequest.java
View File

@@ -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<Long> hostIdList;
@Valid
@NotEmpty
@Schema(description = "上传文件")
private List<UploadTaskFileRequest> files;

2
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/upload/UploadTaskFileRequest.java
View File

@@ -35,7 +35,7 @@ public class UploadTaskFileRequest implements Serializable {
private String filePath;
@NotNull
@Schema(description = "文件发小")
@Schema(description = "文件大小")
private Long fileSize;
}