diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecCommandController.http b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecCommandController.http index d7d38ceb..2f0bd511 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecCommandController.http +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecCommandController.http @@ -6,6 +6,7 @@ Authorization: {{token}} { "description": 1, "timeout": 10, + "scriptExec": 0, "command": "echo 这是日志@{{ hostAddress }}\nsleep 1\necho @{{ hostName }}", "parameterSchema": "[]", "hostIdList": [1] 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 b6dc8990..053e4425 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 @@ -6,7 +6,8 @@ Authorization: {{token}} { "name": "测试 1", "expression": "0 */3 * * * ?", - "timeout": "0", + "timeout": 0, + "scriptExec": 0, "command": "echo 123", "parameterSchema": "[]", "hostIdList": [1] @@ -22,7 +23,8 @@ Authorization: {{token}} "id": 5, "name": "测试 1", "expression": "0 */10 * * * ?", - "timeout": "0", + "timeout": 0, + "scriptExec": 0, "command": "echo 123", "parameterSchema": "[]", "hostIdList": [ diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecTemplateController.http b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecTemplateController.http index dee08705..018c5cf9 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecTemplateController.http +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecTemplateController.http @@ -6,7 +6,8 @@ Authorization: {{token}} { "name": "", "command": "", - "timeout": "", + "timeout": 0, + "scriptExec": 0, "parameterSchema": "" } @@ -20,7 +21,8 @@ Authorization: {{token}} "id": "", "name": "", "command": "", - "timeout": "", + "timeout": 0, + "scriptExec": 0, "parameterSchema": "" } @@ -47,7 +49,8 @@ Authorization: {{token}} "id": "", "name": "", "command": "", - "timeout": "", + "timeout": 0, + "scriptExec": 0, "parameterSchema": "" } diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecHostLogDO.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecHostLogDO.java index 1981ac2c..e6e950c5 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecHostLogDO.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecHostLogDO.java @@ -68,6 +68,10 @@ public class ExecHostLogDO extends BaseDO { @TableField("log_path") private String logPath; + @Schema(description = "脚本路径") + @TableField("script_path") + private String scriptPath; + @Schema(description = "错误信息") @TableField("error_message") private String errorMessage; 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 109a6c9d..2c089959 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 @@ -46,6 +46,10 @@ public class ExecJobDO extends BaseDO { @TableField("timeout") private Integer timeout; + @Schema(description = "是否使用脚本执行") + @TableField("script_exec") + private Integer scriptExec; + @Schema(description = "执行命令") @TableField("command") private String command; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecLogDO.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecLogDO.java index e0a1fc78..7a4239f9 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecLogDO.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecLogDO.java @@ -68,6 +68,10 @@ public class ExecLogDO extends BaseDO { @TableField("timeout") private Integer timeout; + @Schema(description = "是否使用脚本执行") + @TableField("script_exec") + private Integer scriptExec; + @Schema(description = "执行状态") @TableField("status") private String status; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecTemplateDO.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecTemplateDO.java index 19b26aec..bf8cd871 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecTemplateDO.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecTemplateDO.java @@ -42,6 +42,10 @@ public class ExecTemplateDO extends BaseDO { @TableField("timeout") private Integer timeout; + @Schema(description = "是否使用脚本执行") + @TableField("script_exec") + private Integer scriptExec; + @Schema(description = "参数定义") @TableField("parameter_schema") private String parameterSchema; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecCommandExecRequest.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecCommandExecRequest.java index 5db1a782..4ea9cda4 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecCommandExecRequest.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecCommandExecRequest.java @@ -43,6 +43,9 @@ public class ExecCommandExecRequest { @Schema(description = "超时时间") private Integer timeout; + @Schema(description = "是否使用脚本执行") + private Integer scriptExec; + @Schema(description = "执行命令") private String command; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecCommandRequest.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecCommandRequest.java index 9b5307b5..dde46290 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecCommandRequest.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecCommandRequest.java @@ -30,6 +30,10 @@ public class ExecCommandRequest { @Schema(description = "超时时间") private Integer timeout; + @NonNull + @Schema(description = "是否使用脚本执行") + private Integer scriptExec; + @NotBlank @Schema(description = "执行命令") private String command; 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 0b23b9cd..f9287a83 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 @@ -1,10 +1,7 @@ package com.orion.ops.module.asset.entity.request.exec; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; @@ -43,6 +40,10 @@ public class ExecJobCreateRequest implements Serializable { @Schema(description = "超时时间") private Integer timeout; + @NonNull + @Schema(description = "是否使用脚本执行") + private Integer scriptExec; + @NotBlank @Schema(description = "执行命令") private String command; 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 eb5c642e..abc10d62 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 @@ -1,10 +1,7 @@ package com.orion.ops.module.asset.entity.request.exec; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; @@ -47,6 +44,10 @@ public class ExecJobUpdateRequest implements Serializable { @Schema(description = "超时时间") private Integer timeout; + @NonNull + @Schema(description = "是否使用脚本执行") + private Integer scriptExec; + @NotBlank @Schema(description = "执行命令") private String command; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecTemplateCreateRequest.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecTemplateCreateRequest.java index f958a1f7..e706f209 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecTemplateCreateRequest.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecTemplateCreateRequest.java @@ -40,6 +40,10 @@ public class ExecTemplateCreateRequest implements Serializable { @Schema(description = "超时时间秒 0不超时") private Integer timeout; + @NotNull + @Schema(description = "是否使用脚本执行") + private Integer scriptExec; + @Schema(description = "参数定义") private String parameterSchema; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecTemplateUpdateRequest.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecTemplateUpdateRequest.java index 1e69a40d..95a291d0 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecTemplateUpdateRequest.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecTemplateUpdateRequest.java @@ -44,6 +44,10 @@ public class ExecTemplateUpdateRequest implements Serializable { @Schema(description = "超时时间秒 0不超时") private Integer timeout; + @NotNull + @Schema(description = "是否使用脚本执行") + private Integer scriptExec; + @Schema(description = "参数定义") private String parameterSchema; 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 42f9d989..bab5ab3e 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 @@ -38,6 +38,9 @@ public class ExecJobVO implements Serializable { @Schema(description = "超时时间") private Integer timeout; + @Schema(description = "是否使用脚本执行") + private Integer scriptExec; + @Schema(description = "执行命令") private String command; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecLogVO.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecLogVO.java index 3d5f8b43..83856679 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecLogVO.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecLogVO.java @@ -50,6 +50,9 @@ public class ExecLogVO implements Serializable { @Schema(description = "超时时间") private Integer timeout; + @Schema(description = "是否使用脚本执行") + private Integer scriptExec; + @Schema(description = "执行状态") private String status; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecTemplateVO.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecTemplateVO.java index f1ee8cef..a5d0ed0d 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecTemplateVO.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecTemplateVO.java @@ -37,6 +37,9 @@ public class ExecTemplateVO implements Serializable { @Schema(description = "超时时间秒 0不超时") private Integer timeout; + @Schema(description = "是否使用脚本执行") + private Integer scriptExec; + @Schema(description = "参数定义") private String parameterSchema; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/exec/command/dto/ExecCommandDTO.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/exec/command/dto/ExecCommandDTO.java index c2447c9b..bd38280a 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/exec/command/dto/ExecCommandDTO.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/exec/command/dto/ExecCommandDTO.java @@ -28,6 +28,9 @@ public class ExecCommandDTO { @Schema(description = "超时时间") private Integer timeout; + @Schema(description = "是否使用脚本执行") + private Integer scriptExec; + @Schema(description = "主机") private List hosts; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/exec/command/dto/ExecCommandHostDTO.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/exec/command/dto/ExecCommandHostDTO.java index 03f299d4..f6a59365 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/exec/command/dto/ExecCommandHostDTO.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/exec/command/dto/ExecCommandHostDTO.java @@ -29,6 +29,9 @@ public class ExecCommandHostDTO { @Schema(description = "日志文件路径") private String logPath; + @Schema(description = "脚本路径") + private String scriptPath; + @Schema(description = "执行命令") private String command; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecCommandServiceImpl.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecCommandServiceImpl.java index d4063294..b3207c96 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecCommandServiceImpl.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecCommandServiceImpl.java @@ -82,13 +82,14 @@ public class ExecCommandServiceImpl implements ExecCommandService { @Resource private AssetAuthorizedDataService assetAuthorizedDataService; + // TODO 新增 修改 时候先检查 scriptExec, 然后测试一下 + @Override @Transactional(rollbackFor = Exception.class) public ExecLogVO execCommand(ExecCommandRequest request) { log.info("ExecService.startExecCommand start params: {}", JSON.toJSONString(request)); LoginUser user = Objects.requireNonNull(SecurityUtils.getLoginUser()); Long userId = user.getId(); - String command = request.getCommand(); List hostIdList = request.getHostIdList(); // 检查主机权限 List authorizedHostIdList = assetAuthorizedDataService.getUserAuthorizedHostId(userId, HostConfigTypeEnum.SSH); @@ -126,6 +127,7 @@ public class ExecCommandServiceImpl implements ExecCommandService { .command(command) .parameterSchema(request.getParameterSchema()) .timeout(request.getTimeout()) + .scriptExec(request.getScriptExec()) .status(ExecStatusEnum.WAITING.name()) .build(); execLogDAO.insert(execLog); @@ -145,6 +147,8 @@ public class ExecCommandServiceImpl implements ExecCommandService { .command(FORMATTER.format(command, parameter)) .parameter(parameter) .logPath(this.buildLogPath(execId, s.getId())) + // FIXME 测试 添加用户名 + // .scriptPath() .build(); }).collect(Collectors.toList()); execHostLogDAO.insertBatch(execHostLogs); @@ -176,6 +180,7 @@ public class ExecCommandServiceImpl implements ExecCommandService { ExecCommandRequest request = ExecCommandRequest.builder() .description(execLog.getDescription()) .timeout(execLog.getTimeout()) + .scriptExec(execLog.getScriptExec()) .command(execLog.getCommand()) .parameterSchema(execLog.getParameterSchema()) .hostIdList(hostIdList) @@ -193,6 +198,7 @@ public class ExecCommandServiceImpl implements ExecCommandService { ExecCommandDTO exec = ExecCommandDTO.builder() .logId(execLog.getId()) .timeout(execLog.getTimeout()) + .scriptExec(execLog.getScriptExec()) .hosts(execHostLogs.stream() .map(s -> ExecCommandHostDTO.builder() .hostId(s.getHostId()) @@ -200,6 +206,7 @@ public class ExecCommandServiceImpl implements ExecCommandService { .command(s.getCommand()) .timeout(execLog.getTimeout()) .logPath(s.getLogPath()) + .scriptPath(s.getScriptPath()) .build()) .collect(Collectors.toList())) .build(); @@ -231,6 +238,7 @@ public class ExecCommandServiceImpl implements ExecCommandService { params.put("timestamp", date.getTime() / Dates.SECOND_STAMP); params.put("date", Dates.format(date, Dates.YMD)); params.put("datetime", Dates.format(date, Dates.YMD_HMS)); + // TODO script Exec return params; } @@ -250,6 +258,8 @@ public class ExecCommandServiceImpl implements ExecCommandService { params.put("hostAddress", host.getAddress()); params.put("hostUuid", uuid); params.put("hostUuidShort", uuid.replace("-", Strings.EMPTY)); + // TODO host username + // TODO scriptPath return params; } 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 ba922ef5..d16c6fb6 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 @@ -286,6 +286,7 @@ public class ExecJobServiceImpl implements ExecJobService { .execSeq(execSeq) .description(job.getName()) .timeout(job.getTimeout()) + .scriptExec(job.getScriptExec()) .command(job.getCommand()) .parameterSchema(job.getParameterSchema()) .hostIdList(hostIdList) diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/resources/mapper/ExecHostLogMapper.xml b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/resources/mapper/ExecHostLogMapper.xml index f6d8c196..98177313 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/resources/mapper/ExecHostLogMapper.xml +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/resources/mapper/ExecHostLogMapper.xml @@ -14,6 +14,7 @@ + @@ -26,7 +27,7 @@ - id, log_id, host_id, host_name, host_address, status, command, parameter, exit_status, log_path, error_message, start_time, finish_time, create_time, update_time, creator, updater, deleted + id, log_id, host_id, host_name, host_address, status, command, parameter, exit_status, log_path, script_path, error_message, start_time, finish_time, create_time, update_time, creator, updater, deleted diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/resources/mapper/ExecJobMapper.xml b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/resources/mapper/ExecJobMapper.xml index 7b3e2c58..6f7d24b2 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/resources/mapper/ExecJobMapper.xml +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/resources/mapper/ExecJobMapper.xml @@ -9,6 +9,7 @@ + @@ -22,7 +23,7 @@ - id, name, exec_seq, expression, timeout, command, parameter_schema, status, recent_log_id, create_time, update_time, creator, updater, deleted + id, name, exec_seq, expression, timeout, script_exec, command, parameter_schema, status, recent_log_id, create_time, update_time, creator, updater, deleted diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml index 16c894d4..2a5cf205 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml @@ -14,6 +14,7 @@ + @@ -26,7 +27,7 @@ - id, user_id, username, source, source_id, description, exec_seq, command, parameter_schema, timeout, status, start_time, finish_time, create_time, update_time, creator, updater, deleted + id, user_id, username, source, source_id, description, exec_seq, command, parameter_schema, timeout, script_exec, status, start_time, finish_time, create_time, update_time, creator, updater, deleted