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-04-07 22:48:35 +08:00
parent c674860885
commit 1771f05b65
5 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/ErrorCode.java
View File

@@ -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, "不支持此操作"),
;

8
orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/core/handler/GlobalExceptionHandler.java
View File

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

3
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java
View File

@@ -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<TimeoutEndpoint> timeoutChecker;
@Getter
private List<IExecCommandHandler> handlers;

1
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostSftpLogServiceImpl.java
View File

@@ -38,7 +38,6 @@ public class HostSftpLogServiceImpl implements HostSftpLogService {
public DataGrid<HostSftpLogVO> getHostSftpLogPage(HostSftpLogQueryRequest request) {
// 查询
OperatorLogQueryDTO query = this.buildQueryInfo(request);
// TODO TEST
// 转换
return operatorLogApi.getOperatorLogPage(query)
.map(s -> {

2
orion-ops-module-asset/orion-ops-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml
View File

@@ -10,7 +10,7 @@
<result column="source" property="source"/>
<result column="source_id" property="sourceId"/>
<result column="description" property="description"/>
<result column="exec_seq" property="exec_seq"/>
<result column="exec_seq" property="execSeq"/>
<result column="command" property="command"/>
<result column="parameter_schema" property="parameterSchema"/>
<result column="timeout" property="timeout"/>