From d757e13b46c209ca5eafa896932c34ddf22071b4 Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Fri, 12 Apr 2024 00:07:36 +0800 Subject: [PATCH] =?UTF-8?q?:construction:=20=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- docs/README.md | 2 +- docs/about/change-log.md | 6 +++- .../core/generator/CodeGenerators.java | 6 ++-- .../asset/controller/ExecJobController.http | 12 +++---- .../asset/controller/ExecJobController.java | 18 +++++------ .../controller/ExecJobLogController.http | 8 ++--- .../controller/ExecJobLogController.java | 24 +++++++------- .../module/asset/convert/ExecJobConvert.java | 2 +- .../ops/module/asset/dao/ExecJobDAO.java | 2 +- .../ops/module/asset/dao/ExecJobHostDAO.java | 2 +- .../operator/ExecCommandLogOperatorType.java | 2 +- .../operator/ExecJobLogOperatorType.java | 10 +++--- .../define/operator/ExecJobOperatorType.java | 12 +++---- .../module/asset/entity/domain/ExecJobDO.java | 4 +-- .../asset/entity/domain/ExecJobHostDO.java | 4 +-- .../request/exec/ExecJobCreateRequest.java | 4 +-- .../request/exec/ExecJobQueryRequest.java | 4 +-- .../request/exec/ExecJobTriggerRequest.java | 4 +-- .../request/exec/ExecJobUpdateRequest.java | 4 +-- .../exec/ExecJobUpdateStatusRequest.java | 4 +-- .../module/asset/entity/vo/ExecJobHostVO.java | 4 +-- .../ops/module/asset/entity/vo/ExecJobVO.java | 4 +-- .../module/asset/enums/ExecSourceEnum.java | 2 +- .../handler/host/exec/job/ExecCommandJob.java | 2 +- .../asset/service/ExecJobHostService.java | 2 +- .../module/asset/service/ExecJobService.java | 14 ++++---- .../service/impl/ExecJobHostServiceImpl.java | 2 +- .../service/impl/ExecJobServiceImpl.java | 2 +- .../asset/service/impl/HostServiceImpl.java | 2 +- orion-ops-ui/src/api/exec/exec-job-log.ts | 32 +++++++++---------- orion-ops-ui/src/api/exec/exec-job.ts | 24 +++++++------- .../exec-job/components/exec-job-table.vue | 2 +- .../src/views/exec/exec-job/types/const.ts | 4 +-- 34 files changed, 118 insertions(+), 114 deletions(-) diff --git a/README.md b/README.md index c1ec3cb3..2396e68d 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ demo: http://101.43.254.243:1081/ * 在线终端: 提供便捷的在线 Web 终端服务, 支持快捷命令、自定义快捷键和主题风格。 * 文件管理: 实现远程主机大文件的批量上传、下载和在线编辑等操作。 * 批量操作: 支持远程主机批量执行 shell 命令。 -* 计划执行: 支持配置 cron 表达式, 定时执行主机 shell 命令。 +* 计划任务: 支持配置 cron 表达式, 定时执行主机 shell 命令。 * 操作日志: 记录用户操作日志，确保操作可追溯, 提高系统安全性。 * 可扩展性: 前后端代码规范统一、代码质量高、健壮且易于阅读和扩展。 diff --git a/docs/README.md b/docs/README.md index 8046d922..fea63ca3 100644 --- a/docs/README.md +++ b/docs/README.md @@ -49,7 +49,7 @@ demo: http://101.43.254.243:1081/ * 在线终端: 提供便捷的在线 Web 终端服务, 支持快捷命令、自定义快捷键和主题风格。 * 文件管理: 实现远程主机大文件的批量上传、下载和在线编辑等操作。 * 批量操作: 支持远程主机批量执行 shell 命令。 -* 计划执行: 支持配置 cron 表达式, 定时执行主机 shell 命令。 +* 计划任务: 支持配置 cron 表达式, 定时执行主机 shell 命令。 * 操作日志: 记录用户操作日志，确保操作可追溯, 提高系统安全性。 * 可扩展性: 前后端代码规范统一、代码质量高、健壮且易于阅读和扩展。 diff --git a/docs/about/change-log.md b/docs/about/change-log.md index 0f3894e1..5cec20fa 100644 --- a/docs/about/change-log.md +++ b/docs/about/change-log.md @@ -9,8 +9,12 @@ * 🐞 修复 主机列表卡片视图重置条件后 tag 消失 * 🐞 修复 主机分组授权页面刷新不显示 loading * 🐞 修复 面包屑组件路径显示不全的问题 +* 🐞 修复 数据字典历史提示无权限 * 🩰 修改 主机终端亮色模式配色 -* 🌈 新增 定时执行模块 +* 🩰 修改 执行模板 UI 修改 +* 🌈 新增 计划任务模块 +* 🌈 新增 计划任务日志模块 +* 🔨 添加 quartz 配置 * 🔨 修改 redisson 配置 * 🔨 优化 orion-ops-framework 配置规范化 * 🔨 优化 前端 props 命名规范化 diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerators.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerators.java index 927b2d58..a0ca3570 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerators.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerators.java @@ -44,18 +44,18 @@ public class CodeGenerators { // .color("blue", "gray", "red", "green", "white") // .valueUseFields() // .build(), - Template.create("exec_job", "计划执行", "exec") + Template.create("exec_job", "计划任务", "exec") .disableUnitTest() .vue("exec", "exec-job") .enableDrawerForm() .dict("execJobStatus", "status") - .comment("计划执行状态") + .comment("计划任务状态") .field("execJobStatus") .fields("DISABLED", "ENABLED") .labels("禁用", "启用") .values(0, 1) .build(), - Template.create("exec_job_host", "计划执行主机", "exec") + Template.create("exec_job_host", "计划任务主机", "exec") .disableUnitTest() .vue("exec", "exec-job-host") .build(), diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobController.http b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobController.http index 6a7015b3..b6dc8990 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobController.http +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobController.http @@ -1,4 +1,4 @@ -### 创建计划执行任务 +### 创建计划任务 POST {{baseUrl}}/asset/exec-job/create Content-Type: application/json Authorization: {{token}} @@ -13,7 +13,7 @@ Authorization: {{token}} } -### 更新计划执行任务 +### 更新计划任务 PUT {{baseUrl}}/asset/exec-job/update Content-Type: application/json Authorization: {{token}} @@ -31,7 +31,7 @@ Authorization: {{token}} } -### 更新计划执行任务状态 +### 更新计划任务状态 PUT {{baseUrl}}/asset/exec-job/update-status Content-Type: application/json Authorization: {{token}} @@ -42,12 +42,12 @@ Authorization: {{token}} } -### 查询计划执行任务 +### 查询计划任务 GET {{baseUrl}}/asset/exec-job/get?id=1 Authorization: {{token}} -### 分页查询计划执行任务 +### 分页查询计划任务 POST {{baseUrl}}/asset/exec-job/query Content-Type: application/json Authorization: {{token}} @@ -62,7 +62,7 @@ Authorization: {{token}} } -### 删除计划执行任务 +### 删除计划任务 DELETE {{baseUrl}}/asset/exec-job/delete?id=1 Authorization: {{token}} 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 47dbb80e..31280676 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 @@ -22,13 +22,13 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; /** - * 计划执行任务 api + * 计划任务 api * * @author Jiahang Li * @version 1.0.3 * @since 2024-3-28 12:03 */ -@Tag(name = "asset - 计划执行任务服务") +@Tag(name = "asset - 计划任务服务") @Slf4j @Validated @RestWrapper @@ -42,7 +42,7 @@ public class ExecJobController { @OperatorLog(ExecJobOperatorType.CREATE) @PostMapping("/create") - @Operation(summary = "创建计划执行任务") + @Operation(summary = "创建计划任务") @PreAuthorize("@ss.hasPermission('asset:exec-job:create')") public Long createExecJob(@Validated @RequestBody ExecJobCreateRequest request) { return execJobService.createExecJob(request); @@ -50,7 +50,7 @@ public class ExecJobController { @OperatorLog(ExecJobOperatorType.UPDATE) @PutMapping("/update") - @Operation(summary = "更新计划执行任务") + @Operation(summary = "更新计划任务") @PreAuthorize("@ss.hasPermission('asset:exec-job:update')") public Integer updateExecJob(@Validated @RequestBody ExecJobUpdateRequest request) { return execJobService.updateExecJobById(request); @@ -58,7 +58,7 @@ public class ExecJobController { @OperatorLog(ExecJobOperatorType.UPDATE_STATUS) @PutMapping("/update-status") - @Operation(summary = "更新计划执行任务状态") + @Operation(summary = "更新计划任务状态") @PreAuthorize("@ss.hasPermission('asset:exec-job:update-status')") public Integer updateExecJobStatus(@Validated @RequestBody ExecJobUpdateStatusRequest request) { return execJobService.updateExecJobStatus(request); @@ -66,7 +66,7 @@ public class ExecJobController { @IgnoreLog(IgnoreLogMode.RET) @GetMapping("/get") - @Operation(summary = "查询计划执行任务") + @Operation(summary = "查询计划任务") @Parameter(name = "id", description = "id", required = true) @PreAuthorize("@ss.hasPermission('asset:exec-job:query')") public ExecJobVO getExecJob(@RequestParam("id") Long id) { @@ -75,7 +75,7 @@ public class ExecJobController { @IgnoreLog(IgnoreLogMode.RET) @PostMapping("/query") - @Operation(summary = "分页查询计划执行任务") + @Operation(summary = "分页查询计划任务") @PreAuthorize("@ss.hasPermission('asset:exec-job:query')") public DataGrid getExecJobPage(@Validated(Page.class) @RequestBody ExecJobQueryRequest request) { return execJobService.getExecJobPage(request); @@ -83,7 +83,7 @@ public class ExecJobController { @OperatorLog(ExecJobOperatorType.DELETE) @DeleteMapping("/delete") - @Operation(summary = "删除计划执行任务") + @Operation(summary = "删除计划任务") @Parameter(name = "id", description = "id", required = true) @PreAuthorize("@ss.hasPermission('asset:exec-job:delete')") public Integer deleteExecJob(@RequestParam("id") Long id) { @@ -92,7 +92,7 @@ public class ExecJobController { @OperatorLog(ExecJobOperatorType.TRIGGER) @PostMapping("/trigger") - @Operation(summary = "手动触发计划执行任务") + @Operation(summary = "手动触发计划任务") @PreAuthorize("@ss.hasPermission('asset:exec-job:trigger')") public HttpWrapper triggerExecJob(@Validated @RequestBody ExecJobTriggerRequest request) { execJobService.manualTriggerExecJob(request.getId()); diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobLogController.http b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobLogController.http index 1f8b6353..3b62f862 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobLogController.http +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobLogController.http @@ -1,9 +1,9 @@ -### 查询计划执行任务日志 +### 查询计划任务日志 GET {{baseUrl}}/asset/exec-job-log/get?id=1 Authorization: {{token}} -### 分页查询计划执行任务日志 +### 分页查询计划任务日志 POST {{baseUrl}}/asset/exec-job-log/query Content-Type: application/json Authorization: {{token}} @@ -20,12 +20,12 @@ Authorization: {{token}} } -### 删除计划执行任务日志 +### 删除计划任务日志 DELETE {{baseUrl}}/asset/exec-job-log/delete?id=1 Authorization: {{token}} -### 批量删除计划执行任务日志 +### 批量删除计划任务日志 DELETE {{baseUrl}}/asset/exec-job-log/batch-delete?idList=1,2,3 Authorization: {{token}} 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 9ec7e317..7f2e4e27 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 @@ -28,13 +28,13 @@ import javax.servlet.http.HttpServletResponse; import java.util.List; /** - * 计划执行任务日志 api + * 计划任务日志 api * * @author Jiahang Li * @version 1.0.1 * @since 2024-3-11 11:31 */ -@Tag(name = "asset - 计划执行任务日志服务") +@Tag(name = "asset - 计划任务日志服务") @Slf4j @Validated @RestWrapper @@ -53,7 +53,7 @@ public class ExecJobLogController { @IgnoreLog(IgnoreLogMode.RET) @PostMapping("/query") - @Operation(summary = "分页查询计划执行任务日志") + @Operation(summary = "分页查询计划任务日志") @PreAuthorize("@ss.hasPermission('asset:exec-job-log:query')") public DataGrid getExecJobLogPage(@Validated(Page.class) @RequestBody ExecLogQueryRequest request) { request.setSource(SOURCE); @@ -62,7 +62,7 @@ public class ExecJobLogController { @IgnoreLog(IgnoreLogMode.RET) @GetMapping("/get") - @Operation(summary = "查询计划执行任务日志") + @Operation(summary = "查询计划任务日志") @PreAuthorize("@ss.hasPermission('asset:exec-job-log:query')") public ExecLogVO getExecJobLog(@RequestParam("id") Long id) { return execLogService.getExecLog(id, SOURCE); @@ -87,7 +87,7 @@ public class ExecJobLogController { @OperatorLog(ExecJobLogOperatorType.DELETE) @DeleteMapping("/delete") - @Operation(summary = "删除计划执行任务日志") + @Operation(summary = "删除计划任务日志") @Parameter(name = "id", description = "id", required = true) @PreAuthorize("@ss.hasPermission('asset:exec-job-log:delete')") public Integer deleteExecJobLog(@RequestParam("id") Long id) { @@ -96,7 +96,7 @@ public class ExecJobLogController { @OperatorLog(ExecJobLogOperatorType.DELETE) @DeleteMapping("/batch-delete") - @Operation(summary = "删除计划执行任务日志") + @Operation(summary = "删除计划任务日志") @Parameter(name = "idList", description = "idList", required = true) @PreAuthorize("@ss.hasPermission('asset:exec-job-log:delete')") public Integer batchDeleteExecJobLog(@RequestParam("idList") List idList) { @@ -113,7 +113,7 @@ public class ExecJobLogController { } @PostMapping("/query-count") - @Operation(summary = "查询计划执行任务日志数量") + @Operation(summary = "查询计划任务日志数量") @PreAuthorize("@ss.hasPermission('asset:exec-job-log:management:clear')") public Long getExecJobLogCount(@RequestBody ExecLogQueryRequest request) { request.setSource(SOURCE); @@ -122,7 +122,7 @@ public class ExecJobLogController { @OperatorLog(ExecJobLogOperatorType.CLEAR) @PostMapping("/clear") - @Operation(summary = "清空计划执行任务日志") + @Operation(summary = "清空计划任务日志") @PreAuthorize("@ss.hasPermission('asset:exec-job-log:management:clear')") public Integer clearExecJobLog(@RequestBody ExecLogQueryRequest request) { request.setSource(SOURCE); @@ -130,8 +130,8 @@ public class ExecJobLogController { } @PostMapping("/tail") - @Operation(summary = "查看计划执行任务日志") - @PreAuthorize("@ss.hasAnyPermission('asset:exec-job-log:query', 'asset:exec-job:exec')") + @Operation(summary = "查看计划任务日志") + @PreAuthorize("@ss.hasPermission('asset:exec-job-log:query')") public String getExecJobLogTailToken(@Validated @RequestBody ExecLogTailRequest request) { request.setSource(SOURCE); return execLogService.getExecLogTailToken(request); @@ -139,8 +139,8 @@ public class ExecJobLogController { @OperatorLog(ExecJobLogOperatorType.DOWNLOAD) @GetMapping("/download") - @Operation(summary = "下载计划执行任务日志") - @PreAuthorize("@ss.hasAnyPermission('asset:exec-job-log:query', 'asset:exec-job:exec')") + @Operation(summary = "下载计划任务日志") + @PreAuthorize("@ss.hasPermission('asset:exec-job-log:query')") public void downloadExecJobLogFile(@RequestParam("id") Long id, HttpServletResponse response) { execLogService.downloadLogFile(id, SOURCE, response); } diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/convert/ExecJobConvert.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/convert/ExecJobConvert.java index 306bf6b4..c7756eea 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/convert/ExecJobConvert.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/convert/ExecJobConvert.java @@ -11,7 +11,7 @@ import org.mapstruct.factory.Mappers; import java.util.List; /** - * 计划执行任务 内部对象转换器 + * 计划任务 内部对象转换器 * * @author Jiahang Li * @version 1.0.3 diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/dao/ExecJobDAO.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/dao/ExecJobDAO.java index 16a68a18..02794c92 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/dao/ExecJobDAO.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/dao/ExecJobDAO.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; /** - * 计划执行任务 Mapper 接口 + * 计划任务 Mapper 接口 * * @author Jiahang Li * @version 1.0.3 diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/dao/ExecJobHostDAO.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/dao/ExecJobHostDAO.java index 1b1b09e7..8900d86f 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/dao/ExecJobHostDAO.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/dao/ExecJobHostDAO.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; /** - * 计划执行任务主机 Mapper 接口 + * 计划任务主机 Mapper 接口 * * @author Jiahang Li * @version 1.0.3 diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/ExecCommandLogOperatorType.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/ExecCommandLogOperatorType.java index 2a690ff4..f285ef0d 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/ExecCommandLogOperatorType.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/ExecCommandLogOperatorType.java @@ -31,7 +31,7 @@ public class ExecCommandLogOperatorType extends InitializingOperatorTypes { new OperatorType(H, DELETE, "删除批量执行日志 ${count} 条"), new OperatorType(H, DELETE_HOST, "删除批量执行主机日志 ${logId} ${hostName}"), new OperatorType(H, CLEAR, "清理批量执行日志 ${count} 条"), - new OperatorType(L, DOWNLOAD, "下载主机执行日志 ${logId} ${hostName}"), + new OperatorType(L, DOWNLOAD, "下载批量执行日志 ${logId} ${hostName}"), }; } diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/ExecJobLogOperatorType.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/ExecJobLogOperatorType.java index b4d13330..1b9064e6 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/ExecJobLogOperatorType.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/ExecJobLogOperatorType.java @@ -8,7 +8,7 @@ import static com.orion.ops.framework.biz.operator.log.core.enums.OperatorRiskLe import static com.orion.ops.framework.biz.operator.log.core.enums.OperatorRiskLevel.L; /** - * 计划执行日志 操作记录类型 + * 计划任务执行日志 操作记录类型 * * @author Jiahang Li * @version 1.0.1 @@ -28,10 +28,10 @@ public class ExecJobLogOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(H, DELETE, "删除计划执行日志 ${count} 条"), - new OperatorType(H, DELETE_HOST, "删除计划执行主机日志 ${logId} ${hostName}"), - new OperatorType(H, CLEAR, "清理计划执行日志 ${count} 条"), - new OperatorType(L, DOWNLOAD, "下载主机执行日志 ${logId} ${hostName}"), + new OperatorType(H, DELETE, "删除计划任务执行日志 ${count} 条"), + new OperatorType(H, DELETE_HOST, "删除计划任务执行主机日志 ${logId} ${hostName}"), + new OperatorType(H, CLEAR, "清理计划任务执行日志 ${count} 条"), + new OperatorType(L, DOWNLOAD, "下载计划任务执行日志 ${logId} ${hostName}"), }; } diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/ExecJobOperatorType.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/ExecJobOperatorType.java index 013771dd..4bca3c74 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/ExecJobOperatorType.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/ExecJobOperatorType.java @@ -7,7 +7,7 @@ import com.orion.ops.framework.biz.operator.log.core.model.OperatorType; import static com.orion.ops.framework.biz.operator.log.core.enums.OperatorRiskLevel.*; /** - * 计划执行任务 操作日志类型 + * 计划任务 操作日志类型 * * @author Jiahang Li * @version 1.0.3 @@ -29,11 +29,11 @@ public class ExecJobOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(L, CREATE, "创建计划执行任务 ${name}"), - new OperatorType(M, UPDATE, "更新计划执行任务 ${before}"), - new OperatorType(M, UPDATE_STATUS, "${statusName}计划执行任务 ${name}"), - new OperatorType(M, TRIGGER, "手动触发计划执行任务 ${name}"), - new OperatorType(H, DELETE, "删除计划执行任务 ${name}"), + new OperatorType(L, CREATE, "创建计划任务 ${name}"), + new OperatorType(M, UPDATE, "更新计划任务 ${before}"), + new OperatorType(M, UPDATE_STATUS, "${statusName}计划任务 ${name}"), + new OperatorType(M, TRIGGER, "手动触发计划任务 ${name}"), + new OperatorType(H, DELETE, "删除计划任务 ${name}"), }; } diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecJobDO.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecJobDO.java index 9ee0def1..109a6c9d 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecJobDO.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecJobDO.java @@ -9,7 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; /** - * 计划执行任务 实体对象 + * 计划任务 实体对象 * * @author Jiahang Li * @version 1.0.3 @@ -21,7 +21,7 @@ import lombok.*; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName(value = "exec_job", autoResultMap = true) -@Schema(name = "ExecJobDO", description = "计划执行任务 实体对象") +@Schema(name = "ExecJobDO", description = "计划任务 实体对象") public class ExecJobDO extends BaseDO { private static final long serialVersionUID = 1L; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecJobHostDO.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecJobHostDO.java index 595534e4..89f25768 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecJobHostDO.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecJobHostDO.java @@ -9,7 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; /** - * 计划执行任务主机 实体对象 + * 计划任务主机 实体对象 * * @author Jiahang Li * @version 1.0.3 @@ -21,7 +21,7 @@ import lombok.*; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName(value = "exec_job_host", autoResultMap = true) -@Schema(name = "ExecJobHostDO", description = "计划执行任务主机 实体对象") +@Schema(name = "ExecJobHostDO", description = "计划任务主机 实体对象") public class ExecJobHostDO extends BaseDO { private static final long serialVersionUID = 1L; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobCreateRequest.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobCreateRequest.java index 954568f2..0b23b9cd 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobCreateRequest.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobCreateRequest.java @@ -14,7 +14,7 @@ import java.io.Serializable; import java.util.List; /** - * 计划执行任务 创建请求对象 + * 计划任务 创建请求对象 * * @author Jiahang Li * @version 1.0.3 @@ -24,7 +24,7 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "ExecJobCreateRequest", description = "计划执行任务 创建请求对象") +@Schema(name = "ExecJobCreateRequest", description = "计划任务 创建请求对象") public class ExecJobCreateRequest implements Serializable { private static final long serialVersionUID = 1L; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobQueryRequest.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobQueryRequest.java index 5bec8daf..0650aafa 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobQueryRequest.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobQueryRequest.java @@ -7,7 +7,7 @@ import lombok.*; import javax.validation.constraints.Size; /** - * 计划执行任务 查询请求对象 + * 计划任务 查询请求对象 * * @author Jiahang Li * @version 1.0.3 @@ -18,7 +18,7 @@ import javax.validation.constraints.Size; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Schema(name = "ExecJobQueryRequest", description = "计划执行任务 查询请求对象") +@Schema(name = "ExecJobQueryRequest", description = "计划任务 查询请求对象") public class ExecJobQueryRequest extends PageRequest { @Schema(description = "id") diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobTriggerRequest.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobTriggerRequest.java index a5e3a03f..135dd1a1 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobTriggerRequest.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobTriggerRequest.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull; import java.io.Serializable; /** - * 计划执行任务 手动触发请求对象 + * 计划任务 手动触发请求对象 * * @author Jiahang Li * @version 1.0.3 @@ -20,7 +20,7 @@ import java.io.Serializable; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "ExecJobTriggerRequest", description = "计划执行任务 手动触发请求对象") +@Schema(name = "ExecJobTriggerRequest", description = "计划任务 手动触发请求对象") public class ExecJobTriggerRequest implements Serializable { private static final long serialVersionUID = 1L; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobUpdateRequest.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobUpdateRequest.java index 494f380a..eb5c642e 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobUpdateRequest.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobUpdateRequest.java @@ -14,7 +14,7 @@ import java.io.Serializable; import java.util.List; /** - * 计划执行任务 更新请求对象 + * 计划任务 更新请求对象 * * @author Jiahang Li * @version 1.0.3 @@ -24,7 +24,7 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "ExecJobUpdateRequest", description = "计划执行任务 更新请求对象") +@Schema(name = "ExecJobUpdateRequest", description = "计划任务 更新请求对象") public class ExecJobUpdateRequest implements Serializable { private static final long serialVersionUID = 1L; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobUpdateStatusRequest.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobUpdateStatusRequest.java index 12e550b0..f3f37e99 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobUpdateStatusRequest.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobUpdateStatusRequest.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull; import java.io.Serializable; /** - * 计划执行任务 更新状态请求对象 + * 计划任务 更新状态请求对象 * * @author Jiahang Li * @version 1.0.3 @@ -20,7 +20,7 @@ import java.io.Serializable; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "ExecJobUpdateStatusRequest", description = "计划执行任务 更新状态请求对象") +@Schema(name = "ExecJobUpdateStatusRequest", description = "计划任务 更新状态请求对象") public class ExecJobUpdateStatusRequest implements Serializable { private static final long serialVersionUID = 1L; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecJobHostVO.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecJobHostVO.java index 4e78c04a..949b8877 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecJobHostVO.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecJobHostVO.java @@ -10,7 +10,7 @@ import java.io.Serializable; import java.util.Date; /** - * 计划执行任务主机 视图响应对象 + * 计划任务主机 视图响应对象 * * @author Jiahang Li * @version 1.0.3 @@ -20,7 +20,7 @@ import java.util.Date; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "ExecJobHostVO", description = "计划执行任务主机 视图响应对象") +@Schema(name = "ExecJobHostVO", description = "计划任务主机 视图响应对象") public class ExecJobHostVO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecJobVO.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecJobVO.java index 789ecbee..42f9d989 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecJobVO.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecJobVO.java @@ -11,7 +11,7 @@ import java.util.Date; import java.util.List; /** - * 计划执行任务 视图响应对象 + * 计划任务 视图响应对象 * * @author Jiahang Li * @version 1.0.3 @@ -21,7 +21,7 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "ExecJobVO", description = "计划执行任务 视图响应对象") +@Schema(name = "ExecJobVO", description = "计划任务 视图响应对象") public class ExecJobVO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/enums/ExecSourceEnum.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/enums/ExecSourceEnum.java index e5f8ffa6..8d07f95b 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/enums/ExecSourceEnum.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/enums/ExecSourceEnum.java @@ -15,7 +15,7 @@ public enum ExecSourceEnum { BATCH, /** - * 计划执行 + * 计划任务 */ JOB, diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/exec/job/ExecCommandJob.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/exec/job/ExecCommandJob.java index d91f89c1..bd3d8f16 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/exec/job/ExecCommandJob.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/exec/job/ExecCommandJob.java @@ -11,7 +11,7 @@ import org.quartz.Job; import org.quartz.JobExecutionContext; /** - * 计划执行命令任务 + * 计划命令任务 * * @author Jiahang Li * @version 1.0.0 diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/ExecJobHostService.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/ExecJobHostService.java index 0f6ff30b..61cde52f 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/ExecJobHostService.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/ExecJobHostService.java @@ -3,7 +3,7 @@ package com.orion.ops.module.asset.service; import java.util.List; /** - * 计划执行任务主机 服务类 + * 计划任务主机 服务类 * * @author Jiahang Li * @version 1.0.3 diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/ExecJobService.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/ExecJobService.java index be65b499..9946dc5e 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/ExecJobService.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/ExecJobService.java @@ -5,7 +5,7 @@ import com.orion.ops.module.asset.entity.request.exec.*; import com.orion.ops.module.asset.entity.vo.ExecJobVO; /** - * 计划执行任务 服务类 + * 计划任务 服务类 * * @author Jiahang Li * @version 1.0.3 @@ -14,7 +14,7 @@ import com.orion.ops.module.asset.entity.vo.ExecJobVO; public interface ExecJobService { /** - * 创建计划执行任务 + * 创建计划任务 * * @param request request * @return id @@ -22,7 +22,7 @@ public interface ExecJobService { Long createExecJob(ExecJobCreateRequest request); /** - * 更新计划执行任务 + * 更新计划任务 * * @param request request * @return effect @@ -30,7 +30,7 @@ public interface ExecJobService { Integer updateExecJobById(ExecJobUpdateRequest request); /** - * 更新计划执行任务状态 + * 更新计划任务状态 * * @param request request * @return effect @@ -38,7 +38,7 @@ public interface ExecJobService { Integer updateExecJobStatus(ExecJobUpdateStatusRequest request); /** - * 查询计划执行任务 + * 查询计划任务 * * @param id id * @return row @@ -46,7 +46,7 @@ public interface ExecJobService { ExecJobVO getExecJobById(Long id); /** - * 分页查询计划执行任务 + * 分页查询计划任务 * * @param request request * @return rows @@ -62,7 +62,7 @@ public interface ExecJobService { Integer getNextExecSeq(Long id); /** - * 删除计划执行任务 + * 删除计划任务 * * @param id id * @return effect diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecJobHostServiceImpl.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecJobHostServiceImpl.java index 877ce900..40a2174c 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecJobHostServiceImpl.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecJobHostServiceImpl.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.stream.Collectors; /** - * 计划执行任务主机 服务实现类 + * 计划任务主机 服务实现类 * * @author Jiahang Li * @version 1.0.3 diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecJobServiceImpl.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecJobServiceImpl.java index cb417897..9430ac9c 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecJobServiceImpl.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecJobServiceImpl.java @@ -43,7 +43,7 @@ import java.util.function.Function; import java.util.stream.Collectors; /** - * 计划执行任务 服务实现类 + * 计划任务 服务实现类 * * @author Jiahang Li * @version 1.0.3 diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostServiceImpl.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostServiceImpl.java index ef97f3ec..aa5a20ff 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostServiceImpl.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostServiceImpl.java @@ -217,7 +217,7 @@ public class HostServiceImpl implements HostService { log.info("HostService-deleteHostRelByIdAsync id: {}", id); // 删除主机配置 hostConfigDAO.deleteByHostId(id); - // 删除计划执行任务主机 + // 删除计划任务主机 execJobHostService.deleteByHostId(id); // 删除分组 dataGroupRelApi.deleteByRelId(DataGroupTypeEnum.HOST, id); diff --git a/orion-ops-ui/src/api/exec/exec-job-log.ts b/orion-ops-ui/src/api/exec/exec-job-log.ts index 3fd40073..650511ef 100644 --- a/orion-ops-ui/src/api/exec/exec-job-log.ts +++ b/orion-ops-ui/src/api/exec/exec-job-log.ts @@ -4,7 +4,7 @@ import axios from 'axios'; import qs from 'query-string'; /** - * 计划执行日志查询请求 + * 计划任务日志查询请求 */ export interface ExecJobLogQueryRequest extends Pagination { id?: number; @@ -16,7 +16,7 @@ export interface ExecJobLogQueryRequest extends Pagination { } /** - * 计划执行日志查询响应 + * 计划任务日志查询响应 */ export interface ExecJobLogQueryResponse extends TableData, ExecJobLogQueryExtraResponse { id: number; @@ -34,14 +34,14 @@ export interface ExecJobLogQueryResponse extends TableData, ExecJobLogQueryExtra } /** - * 计划执行日志查询响应 拓展 + * 计划任务日志查询响应 拓展 */ export interface ExecJobLogQueryExtraResponse { hosts: Array; } /** - * 主机计划执行日志查询响应 + * 主机计划任务日志查询响应 */ export interface ExecJobHostLogQueryResponse extends TableData { id: number; @@ -59,7 +59,7 @@ export interface ExecJobHostLogQueryResponse extends TableData { } /** - * 计划执行状态查询响应 + * 计划任务状态查询响应 */ export interface ExecJobLogStatusResponse { logList: Array; @@ -67,7 +67,7 @@ export interface ExecJobLogStatusResponse { } /** - * 计划执行日志 tail 请求 + * 计划任务日志 tail 请求 */ export interface ExecJobLogTailRequest { execId?: number; @@ -75,21 +75,21 @@ export interface ExecJobLogTailRequest { } /** - * 分页查询计划执行日志 + * 分页查询计划任务日志 */ export function getExecJobLogPage(request: ExecJobLogQueryRequest) { return axios.post>('/asset/exec-job-log/query', request); } /** - * 查询计划执行日志 + * 查询计划任务日志 */ export function getExecJobLog(id: number) { return axios.get('/asset/exec-job-log/get', { params: { id } }); } /** - * 查询主机计划执行日志 + * 查询主机计划任务日志 */ export function getExecJobHostLogList(logId: number) { return axios.get>('/asset/exec-job-log/host-list', { params: { logId } }); @@ -108,14 +108,14 @@ export function getExecJobLogStatus(idList: Array) { } /** - * 删除计划执行日志 + * 删除计划任务日志 */ export function deleteExecJobLog(id: number) { return axios.delete('/asset/exec-job-log/delete', { params: { id } }); } /** - * 批量删除计划执行日志 + * 批量删除计划任务日志 */ export function batchDeleteExecJobLog(idList: Array) { return axios.delete('/asset/exec-job-log/batch-delete', { @@ -127,35 +127,35 @@ export function batchDeleteExecJobLog(idList: Array) { } /** - * 删除主机计划执行日志 + * 删除主机计划任务日志 */ export function deleteExecJobHostLog(id: number) { return axios.delete('/asset/exec-job-log/delete-host', { params: { id } }); } /** - * 查询计划执行日志数量 + * 查询计划任务日志数量 */ export function getExecJobLogCount(request: ExecJobLogQueryRequest) { return axios.post('/asset/exec-job-log/query-count', request); } /** - * 清空计划执行日志 + * 清空计划任务日志 */ export function clearExecJobLog(request: ExecJobLogQueryRequest) { return axios.post('/asset/exec-job-log/clear', request); } /** - * 查看计划执行日志 + * 查看计划任务日志 */ export function getExecJobLogTailToken(request: ExecJobLogTailRequest) { return axios.post('/asset/exec-job-log/tail', request); } /** - * 下载计划执行日志文件 + * 下载计划任务日志文件 */ export function downloadExecJobLogFile(id: number) { return axios.get('/asset/exec-job-log/download', { unwrap: true, params: { id } }); diff --git a/orion-ops-ui/src/api/exec/exec-job.ts b/orion-ops-ui/src/api/exec/exec-job.ts index 0e715821..d8641c92 100644 --- a/orion-ops-ui/src/api/exec/exec-job.ts +++ b/orion-ops-ui/src/api/exec/exec-job.ts @@ -4,7 +4,7 @@ import type { HostQueryResponse } from '@/api/asset/host'; import axios from 'axios'; /** - * 计划执行创建请求 + * 计划任务创建请求 */ export interface ExecJobCreateRequest { name?: string; @@ -16,14 +16,14 @@ export interface ExecJobCreateRequest { } /** - * 计划执行更新请求 + * 计划任务更新请求 */ export interface ExecJobUpdateRequest extends ExecJobCreateRequest { id?: number; } /** - * 计划执行状态更新请求 + * 计划任务状态更新请求 */ export interface ExecJobUpdateStatusRequest { id: number; @@ -31,7 +31,7 @@ export interface ExecJobUpdateStatusRequest { } /** - * 计划执行查询请求 + * 计划任务查询请求 */ export interface ExecJobQueryRequest extends Pagination { id?: number; @@ -42,7 +42,7 @@ export interface ExecJobQueryRequest extends Pagination { } /** - * 计划执行查询响应 + * 计划任务查询响应 */ export interface ExecJobQueryResponse extends TableData { id: number; @@ -62,49 +62,49 @@ export interface ExecJobQueryResponse extends TableData { } /** - * 创建计划执行 + * 创建计划任务 */ export function createExecJob(request: ExecJobCreateRequest) { return axios.post('/asset/exec-job/create', request); } /** - * 更新计划执行 + * 更新计划任务 */ export function updateExecJob(request: ExecJobUpdateRequest) { return axios.put('/asset/exec-job/update', request); } /** - * 更新计划执行状态 + * 更新计划任务状态 */ export function updateExecJobStatus(request: ExecJobUpdateStatusRequest) { return axios.put('/asset/exec-job/update-status', request); } /** - * 查询计划执行 + * 查询计划任务 */ export function getExecJob(id: number) { return axios.get('/asset/exec-job/get', { params: { id } }); } /** - * 分页查询计划执行 + * 分页查询计划任务 */ export function getExecJobPage(request: ExecJobQueryRequest) { return axios.post>('/asset/exec-job/query', request); } /** - * 删除计划执行 + * 删除计划任务 */ export function deleteExecJob(id: number) { return axios.delete('/asset/exec-job/delete', { params: { id } }); } /** - * 手动触发计划执行任务 + * 手动触发计划任务 */ export function triggerExecJob(id: number) { return axios.post('/asset/exec-job/trigger', { id }); diff --git a/orion-ops-ui/src/views/exec/exec-job/components/exec-job-table.vue b/orion-ops-ui/src/views/exec/exec-job/components/exec-job-table.vue index d8301218..e7d60b9f 100644 --- a/orion-ops-ui/src/views/exec/exec-job/components/exec-job-table.vue +++ b/orion-ops-ui/src/views/exec/exec-job/components/exec-job-table.vue @@ -41,7 +41,7 @@
- 计划执行列表 + 计划任务列表
diff --git a/orion-ops-ui/src/views/exec/exec-job/types/const.ts b/orion-ops-ui/src/views/exec/exec-job/types/const.ts index bfa40bb4..30795531 100644 --- a/orion-ops-ui/src/views/exec/exec-job/types/const.ts +++ b/orion-ops-ui/src/views/exec/exec-job/types/const.ts @@ -3,7 +3,7 @@ import type { TemplateParam } from '@/components/view/exec-editor/const'; // cron 下次执行次数 export const CronNextTimes = 5; -// 计划执行状态 +// 计划任务状态 export const ExecJobStatus = { // 禁用 DISABLED: 0, @@ -22,7 +22,7 @@ export const jobBuiltinsParams: Array = [ }, ]; -// 计划执行状态 字典项 +// 计划任务状态 字典项 export const execJobStatusKey = 'execJobStatus'; // 执行状态 字典项