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-02-20 00:06:34 +08:00
parent bde002ee34
commit 585cf3c8a6
9 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/AbstractTerminalHandler.java
View File

@@ -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<T extends TerminalBasePayload> 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;
}
}

2
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpChangeModHandler.java
View File

@@ -41,7 +41,7 @@ public class SftpChangeModHandler extends AbstractTerminalHandler<SftpChangeModR
SftpBaseResponse.builder()
.sessionId(payload.getSessionId())
.result(BooleanBit.of(ex == null).getValue())
.msg(ex == null ? null : ex.getMessage())
.msg(this.getErrorMessage(ex))
.build());
}

2
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpGetContentHandler.java
View File

@@ -42,7 +42,7 @@ public class SftpGetContentHandler extends AbstractTerminalHandler<SftpBaseReque
.sessionId(payload.getSessionId())
.result(BooleanBit.of(ex == null).getValue())
.content(content)
.msg(ex == null ? null : ex.getMessage())
.msg(this.getErrorMessage(ex))
.build());
}

2
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpMakeDirectoryHandler.java
View File

@@ -40,7 +40,7 @@ public class SftpMakeDirectoryHandler extends AbstractTerminalHandler<SftpBaseRe
SftpBaseResponse.builder()
.sessionId(payload.getSessionId())
.result(BooleanBit.of(ex == null).getValue())
.msg(ex == null ? null : ex.getMessage())
.msg(this.getErrorMessage(ex))
.build());
}

2
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpMoveHandler.java
View File

@@ -41,7 +41,7 @@ public class SftpMoveHandler extends AbstractTerminalHandler<SftpMoveRequest> {
SftpBaseResponse.builder()
.sessionId(payload.getSessionId())
.result(BooleanBit.of(ex == null).getValue())
.msg(ex == null ? null : ex.getMessage())
.msg(this.getErrorMessage(ex))
.build());
}

2
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpSetContentHandler.java
View File

@@ -40,7 +40,7 @@ public class SftpSetContentHandler extends AbstractTerminalHandler<SftpSetConten
SftpBaseResponse.builder()
.sessionId(payload.getSessionId())
.result(BooleanBit.of(ex == null).getValue())
.msg(ex == null ? null : ex.getMessage())
.msg(this.getErrorMessage(ex))
.build());
}

2
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpTouchHandler.java
View File

@@ -40,7 +40,7 @@ public class SftpTouchHandler extends AbstractTerminalHandler<SftpBaseRequest> {
SftpBaseResponse.builder()
.sessionId(payload.getSessionId())
.result(BooleanBit.of(ex == null).getValue())
.msg(ex == null ? null : ex.getMessage())
.msg(this.getErrorMessage(ex))
.build());
}

2
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpTruncateHandler.java
View File

@@ -40,7 +40,7 @@ public class SftpTruncateHandler extends AbstractTerminalHandler<SftpBaseRequest
SftpBaseResponse.builder()
.sessionId(payload.getSessionId())
.result(BooleanBit.of(ex == null).getValue())
.msg(ex == null ? null : ex.getMessage())
.msg(this.getErrorMessage(ex))
.build());
}

7
orion-ops-ui/src/views/host/terminal/types/terminal.const.ts
View File

@@ -281,8 +281,11 @@ export const TerminalShortcutItems: Array<ShortcutKeyItem> = [
},
];
// 打开 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';