diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/AbstractTerminalHandler.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/AbstractTerminalHandler.java index f9e57385..680e8070 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/AbstractTerminalHandler.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/AbstractTerminalHandler.java @@ -1,5 +1,7 @@ package com.orion.ops.module.asset.handler.host.terminal.handler; +import com.orion.lang.exception.argument.InvalidArgumentException; +import com.orion.ops.framework.common.constant.ErrorMessage; import com.orion.ops.framework.websocket.core.utils.WebSockets; import com.orion.ops.module.asset.handler.host.terminal.enums.OutputTypeEnum; import com.orion.ops.module.asset.handler.host.terminal.manager.TerminalManager; @@ -57,4 +59,20 @@ public abstract class AbstractTerminalHandler imp return (E) channel.getAttributes().get(attr); } + /** + * 获取 sftp 错误信息 + * + * @param ex ex + * @return msg + */ + protected String getErrorMessage(Exception ex) { + if (ex == null) { + return null; + } + if (ex instanceof InvalidArgumentException) { + return ex.getMessage(); + } + return ErrorMessage.OPERATE_ERROR; + } + } diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpChangeModHandler.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpChangeModHandler.java index 1903768d..f769198c 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpChangeModHandler.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpChangeModHandler.java @@ -41,7 +41,7 @@ public class SftpChangeModHandler extends AbstractTerminalHandler { SftpBaseResponse.builder() .sessionId(payload.getSessionId()) .result(BooleanBit.of(ex == null).getValue()) - .msg(ex == null ? null : ex.getMessage()) + .msg(this.getErrorMessage(ex)) .build()); } diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpSetContentHandler.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpSetContentHandler.java index efbd0051..5258c0f2 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpSetContentHandler.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpSetContentHandler.java @@ -40,7 +40,7 @@ public class SftpSetContentHandler extends AbstractTerminalHandler { SftpBaseResponse.builder() .sessionId(payload.getSessionId()) .result(BooleanBit.of(ex == null).getValue()) - .msg(ex == null ? null : ex.getMessage()) + .msg(this.getErrorMessage(ex)) .build()); } diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpTruncateHandler.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpTruncateHandler.java index 11bda36f..e4c13af4 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpTruncateHandler.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpTruncateHandler.java @@ -40,7 +40,7 @@ public class SftpTruncateHandler extends AbstractTerminalHandler = [ }, ]; -// 打开 sshModal key -export const openSshModalKey = Symbol(); +// 打开 sshSettingModal key +export const openSshSettingModalKey = Symbol(); + +// 打开 sftpCreateModal key +export const openSftpCreateModalKey = Symbol(); // 字体后缀 兜底 export const fontFamilySuffix = ',courier-new, courier, monospace';