修改 websocket 连接逻辑.

This commit is contained in:
lijiahangmax
2024-03-22 01:04:30 +08:00
parent 5609f320da
commit 1e9805c99f
32 changed files with 88 additions and 64 deletions

View File

@@ -2,6 +2,7 @@ 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.biz.operator.log.core.enums.ReturnType;
import com.orion.ops.framework.common.utils.Valid;
import com.orion.ops.framework.web.core.annotation.RestWrapper;
import com.orion.ops.module.asset.define.operator.ExecOperatorType;
@@ -40,7 +41,7 @@ public class ExecController {
@Resource
private ExecService execService;
@OperatorLog(ExecOperatorType.EXEC_COMMAND)
@OperatorLog(value = ExecOperatorType.EXEC_COMMAND, ret = ReturnType.IGNORE)
@PostMapping("/exec-command")
@Operation(summary = "批量执行命令")
@PreAuthorize("@ss.hasPermission('asset:exec:exec-command')")
@@ -48,7 +49,7 @@ public class ExecController {
return execService.execCommand(request);
}
@OperatorLog(ExecOperatorType.EXEC_COMMAND)
@OperatorLog(value = ExecOperatorType.EXEC_COMMAND, ret = ReturnType.IGNORE)
@PostMapping("/re-exec-command")
@Operation(summary = "重新执行命令")
@PreAuthorize("@ss.hasPermission('asset:exec:exec-command')")

View File

@@ -35,11 +35,11 @@ public class ExecOperatorType extends InitializingOperatorTypes {
return new OperatorType[]{
new OperatorType(M, EXEC_COMMAND, "执行主机命令"),
new OperatorType(M, INTERRUPT_EXEC, "中断执行命令"),
new OperatorType(M, INTERRUPT_HOST, "中断主机执行命令 ${logId} ${hostName}"),
new OperatorType(H, DELETE_LOG, "删除执行记录 ${count} 条"),
new OperatorType(H, CLEAR_LOG, "清理执行记录 ${count} 条"),
new OperatorType(H, DELETE_HOST_LOG, "删除主机执行记录 ${logId} ${hostName}"),
new OperatorType(L, DOWNLOAD_HOST_LOG, "下载主机执行日志 ${logId} ${hostName}"),
new OperatorType(M, INTERRUPT_HOST, "中断主机执行命令 <sb>${logId}</sb> <sb>${hostName}</sb>"),
new OperatorType(H, DELETE_LOG, "删除执行记录 <sb>${count}</sb>"),
new OperatorType(H, CLEAR_LOG, "清理执行记录 <sb>${count}</sb>"),
new OperatorType(H, DELETE_HOST_LOG, "删除主机执行记录 <sb>${logId}</sb> <sb>${hostName}</sb>"),
new OperatorType(L, DOWNLOAD_HOST_LOG, "下载主机执行日志 <sb>${logId}</sb> <sb>${hostName}</sb>"),
};
}