From b30a48f174ff46cb3f04e1f867086aa42ac736f6 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Sun, 25 Feb 2024 19:29:39 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/orion-ops-pro/nginx.conf                    |  2 ++
 .../terminal/handler/SftpGetContentHandler.java    |  3 ++-
 .../handler/host/terminal/session/SftpSession.java | 14 +++++++++++++-
 .../host/transfer/handler/TransferHandler.java     |  2 +-
 .../host/transfer/session/DownloadSession.java     |  8 +++++++-
 .../components/config/ssh/ssh-config-form.vue      |  2 +-
 .../asset/host-list/types/host.table.columns.ts    |  4 ++--
 .../terminal/components/layout/terminal-panel.vue  |  4 ++--
 .../host/terminal/components/sftp/sftp-table.vue   | 11 ++++++-----
 .../host/terminal/components/sftp/sftp-view.vue    |  2 ++
 10 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/docker/orion-ops-pro/nginx.conf b/docker/orion-ops-pro/nginx.conf
index 9542e7ea..cd23ac2f 100644
--- a/docker/orion-ops-pro/nginx.conf
+++ b/docker/orion-ops-pro/nginx.conf
@@ -21,6 +21,8 @@ server {
         proxy_set_header X-Real-IP  $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
+        # web history 模式 404
+        try_files $uri $uri/ /index.html;
     }
 
     location /orion/api {
diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpGetContentHandler.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpGetContentHandler.java
index ce1e716f..f4364fe1 100644
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpGetContentHandler.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpGetContentHandler.java
@@ -1,5 +1,6 @@
 package com.orion.ops.module.asset.handler.host.terminal.handler;
 
+import com.orion.ops.framework.common.constant.Const;
 import com.orion.ops.framework.common.enums.BooleanBit;
 import com.orion.ops.module.asset.handler.host.terminal.enums.OutputTypeEnum;
 import com.orion.ops.module.asset.handler.host.terminal.model.request.SftpBaseRequest;
@@ -27,7 +28,7 @@ public class SftpGetContentHandler extends AbstractTerminalHandler<SftpBaseReque
         ISftpSession session = terminalManager.getSession(channel.getId(), sessionId);
         String path = payload.getPath();
         log.info("SftpGetContentHandler-handle start sessionId: {}, path: {}", sessionId, path);
-        String content = null;
+        String content = Const.EMPTY;
         Exception ex = null;
         // 获取内容
         try {
diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/session/SftpSession.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/session/SftpSession.java
index 4650a501..92080a0a 100644
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/session/SftpSession.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/session/SftpSession.java
@@ -116,10 +116,22 @@ public class SftpSession extends TerminalSession implements ISftpSession {
     @Override
     public String getContent(String path) {
         path = Valid.checkNormalize(path);
-        try (InputStream in = executor.openInputStream(path)) {
+        try {
+            // 获取文件
+            SftpFile file = executor.getFile(path);
+            if (file == null || file.getSize() == 0L) {
+                return Const.EMPTY;
+            }
+            // 读取文件
+            InputStream in = executor.openInputStream(path);
             return Streams.toString(in, config.getFileContentCharset());
         } catch (Exception e) {
             throw Exceptions.ioRuntime(e);
+        } finally {
+            // 同关闭 transfer downloader
+            // 关闭 inputStream 可能会被阻塞 ??..?? 只能关闭 executor
+            Streams.close(this.executor);
+            this.connect();
         }
     }
 
diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/transfer/handler/TransferHandler.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/transfer/handler/TransferHandler.java
index 4a44285e..f6160743 100644
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/transfer/handler/TransferHandler.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/transfer/handler/TransferHandler.java
@@ -107,7 +107,7 @@ public class TransferHandler implements ITransferHandler {
             ITransferHostSession session = sessions.get(sessionKey);
             if (session == null) {
                 // 获取主机信息
-                HostTerminalConnectDTO connectInfo = hostTerminalService.getTerminalConnectInfo(hostId, this.userId, HostConnectTypeEnum.SFTP);
+                HostTerminalConnectDTO connectInfo = hostTerminalService.getTerminalConnectInfo(this.userId, hostId, HostConnectTypeEnum.SFTP);
                 SessionStore sessionStore = hostTerminalService.openSessionStore(connectInfo);
                 // 打开会话并初始化
                 if (TransferOperatorType.UPLOAD.equals(type.getOperator())) {
diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/transfer/session/DownloadSession.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/transfer/session/DownloadSession.java
index 12b4b554..e7877ad1 100644
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/transfer/session/DownloadSession.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/transfer/session/DownloadSession.java
@@ -46,6 +46,12 @@ public class DownloadSession extends TransferHostSession implements IDownloadSes
             // 检查文件是否存在
             SftpFile file = executor.getFile(path);
             Valid.notNull(file, ErrorMessage.FILE_ABSENT);
+            if (file.getSize() == 0L) {
+                // 文件为空
+                log.info("DownloadSession.startDownload file empty channelId: {}, path: {}", channelId, path);
+                TransferUtils.sendMessage(this.channel, TransferReceiverType.DOWNLOAD_FINISH, null);
+                return;
+            }
             // 打开输入流
             this.inputStream = executor.openInputStream(path);
             log.info("DownloadSession.startDownload open success channelId: {}, path: {}", channelId, path);
@@ -92,7 +98,7 @@ public class DownloadSession extends TransferHostSession implements IDownloadSes
 
     @Override
     protected void closeStream() {
-        // 关闭 inputStream 会被阻塞 ??..?? 只能关闭 executor
+        // 关闭 inputStream 可能会被阻塞 ??..?? 只能关闭 executor
         Streams.close(this.executor);
         this.executor = null;
         this.inputStream = null;
diff --git a/orion-ops-ui/src/views/asset/host-list/components/config/ssh/ssh-config-form.vue b/orion-ops-ui/src/views/asset/host-list/components/config/ssh/ssh-config-form.vue
index ea1976a8..21eb5fb2 100644
--- a/orion-ops-ui/src/views/asset/host-list/components/config/ssh/ssh-config-form.vue
+++ b/orion-ops-ui/src/views/asset/host-list/components/config/ssh/ssh-config-form.vue
@@ -260,7 +260,7 @@
       setLoading(false);
       Message.success('修改成功');
       // 回调 props
-      emits('submitted', { ...formModel.value });
+      emits('submitted', { ...props.content, config: { ...formModel.value } });
     } catch (e) {
     } finally {
       setLoading(false);
diff --git a/orion-ops-ui/src/views/asset/host-list/types/host.table.columns.ts b/orion-ops-ui/src/views/asset/host-list/types/host.table.columns.ts
index 15a9eb5d..f51dc5de 100644
--- a/orion-ops-ui/src/views/asset/host-list/types/host.table.columns.ts
+++ b/orion-ops-ui/src/views/asset/host-list/types/host.table.columns.ts
@@ -30,8 +30,8 @@ const columns = [
   }, {
     title: '操作',
     slotName: 'handle',
-    width: 180,
-    align: 'right',
+    width: 162,
+    align: 'center',
     fixed: 'right',
   },
 ] as TableColumnData[];
diff --git a/orion-ops-ui/src/views/host/terminal/components/layout/terminal-panel.vue b/orion-ops-ui/src/views/host/terminal/components/layout/terminal-panel.vue
index ee88e1d2..6dc47f28 100644
--- a/orion-ops-ui/src/views/host/terminal/components/layout/terminal-panel.vue
+++ b/orion-ops-ui/src/views/host/terminal/components/layout/terminal-panel.vue
@@ -186,8 +186,8 @@
 
   :deep(.arco-tabs-tab) {
     height: 100%;
-    margin: 0;
-    padding: 0;
+    margin: 0 !important;
+    padding: 0 !important;
     color: var(--color-panel-text-1);
     background: var(--color-bg-panel-tabs);
     position: relative;
diff --git a/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-table.vue b/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-table.vue
index b4c9be4f..04cddbc1 100644
--- a/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-table.vue
+++ b/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-table.vue
@@ -68,7 +68,7 @@
           </span>
         </a-tooltip>
         <!-- 编辑内容 -->
-        <a-tooltip v-if="canEditable(record.size, record.isDir)"
+        <a-tooltip v-if="canEditable(record.size, record.attr)"
                    position="top"
                    :mini="true"
                    :overlay-inverse="true"
@@ -204,14 +204,15 @@
   };
 
   // 是否可编辑
-  const canEditable = (size: number, isDir: boolean) => {
-    // 非文件夹并且文件小于 配置大小(MB) 可以编辑
-    return !isDir && size <= previewSize * 1024 * 1024;
+  const canEditable = (size: number, attr: string) => {
+    // 是普通文件 && 文件小于 配置大小(MB) 可以编辑
+    return FILE_TYPE.NORMAL_FILE.value == formatFileType(attr).value
+      && size <= previewSize * 1024 * 1024;
   };
 
   // 点击文件名称
   const clickFilename = (record: TableData) => {
-    if (FILE_TYPE.DIRECTORY.value === formatFileType(record.attr).value) {
+    if (record.isDir) {
       // 进入文件夹
       emits('loadFile', record.path);
     } else {
diff --git a/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-view.vue b/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-view.vue
index 579dbd38..459ced7a 100644
--- a/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-view.vue
+++ b/orion-ops-ui/src/views/host/terminal/components/sftp/sftp-view.vue
@@ -121,6 +121,7 @@
   // 编辑文件
   const editFile = (name: string, path: string) => {
     setEditorLoading(true);
+    setTableLoading(true);
     splitSize.value = 0.6;
     editorView.value = true;
     editorFileName.value = name;
@@ -208,6 +209,7 @@
 
   // 接收获取文件内容响应
   const resolveSftpGetContent = (path: string, result: string, content: string) => {
+    setTableLoading(false);
     setEditorLoading(false);
     // 检查结果
     if (!checkResult(result, '加载失败')) {