diff --git a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/ErrorCode.java b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/ErrorCode.java index 03b1fd32..ab3e9944 100644 --- a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/ErrorCode.java +++ b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/ErrorCode.java @@ -74,21 +74,19 @@ public enum ErrorCode implements CodeInfo { DECRYPT_ERROR(908, "数据解密异常"), - PARSE_ERROR(909, "解析失败"), + TASK_EXECUTE_ERROR(909, "任务执行异常"), - TASK_EXECUTE_ERROR(910, "任务执行异常"), + CONNECT_ERROR(910, "建立连接失败"), - CONNECT_ERROR(911, "建立连接失败"), + INTERRUPT_ERROR(911, "操作中断"), - INTERRUPT_ERROR(912, "操作中断"), + UNSAFE_OPERATOR(912, "不安全的操作"), - UNSAFE_OPERATOR(913, "不安全的操作"), + VCS_OPETATOR_ERROR(913, "仓库操作执行失败"), - VCS_OPETATOR_ERROR(914, "仓库操作执行失败"), + DIABLED_ERROR(914, "数据已被禁用"), - DIABLED_ERROR(915, "数据已被禁用"), - - UNSUPPOETED(916, "不支持此操作"), + UNSUPPOETED(915, "不支持此操作"), ; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/core/handler/GlobalExceptionHandler.java b/orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/core/handler/GlobalExceptionHandler.java index 35767ee0..2ebcbc6b 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/core/handler/GlobalExceptionHandler.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/core/handler/GlobalExceptionHandler.java @@ -243,15 +243,9 @@ public class GlobalExceptionHandler { return ErrorCode.INTERNAL_SERVER_ERROR.wrapper(); } - @ExceptionHandler(value = ParseRuntimeException.class) - public HttpWrapper parseRuntimeExceptionHandler(ParseRuntimeException ex) { - log.error("parseRuntimeExceptionHandler", ex); - return ErrorCode.PARSE_ERROR.wrapper(); - } - @ExceptionHandler(value = CodeArgumentException.class) public HttpWrapper codeArgumentExceptionHandler(CodeArgumentException ex) { - return HttpWrapper.error(ex.getCode(), ex.getMessage()); + return HttpWrapper.of(ex.getCode(), ex.getMessage()); } @ExceptionHandler(value = HttpWrapperException.class) diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java index 4d26d0d9..325270da 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java @@ -2,6 +2,7 @@ package com.orion.ops.module.asset.handler.host.exec.command.handler; import com.orion.lang.support.timeout.TimeoutChecker; import com.orion.lang.support.timeout.TimeoutCheckers; +import com.orion.lang.support.timeout.TimeoutEndpoint; import com.orion.lang.utils.Threads; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.io.Streams; @@ -36,7 +37,7 @@ public class ExecTaskHandler implements IExecTaskHandler { private final ExecCommandDTO execCommand; - private TimeoutChecker timeoutChecker; + private TimeoutChecker timeoutChecker; @Getter private List handlers; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostSftpLogServiceImpl.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostSftpLogServiceImpl.java index 3c011238..bb5e6955 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostSftpLogServiceImpl.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostSftpLogServiceImpl.java @@ -38,7 +38,6 @@ public class HostSftpLogServiceImpl implements HostSftpLogService { public DataGrid getHostSftpLogPage(HostSftpLogQueryRequest request) { // 查询 OperatorLogQueryDTO query = this.buildQueryInfo(request); - // TODO TEST // 转换 return operatorLogApi.getOperatorLogPage(query) .map(s -> { 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 ce4c131e..16c894d4 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 @@ -10,7 +10,7 @@ - +