From c20c83245f09d775c087d6730eac6ef28695d927 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Sun, 14 Jul 2024 21:24:53 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=20windows=20?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=87=E4=BB=BD=E5=A4=B1=E8=B4=A5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../terminal/handler/SftpRemoveHandler.java   |  7 +++--
 .../host/transfer/utils/TransferUtils.java    |  7 ++++-
 .../service/impl/HostSftpServiceImpl.java     |  5 ++-
 .../visor/module/asset/utils/SftpUtils.java   |  9 +++++-
 orion-visor-ui/src/api/asset/host-sftp.ts     |  1 +
 .../sftp-log/components/sftp-log-table.vue    | 31 +++++++++++++------
 .../views/asset-audit/sftp-log/types/const.ts |  3 ++
 .../sftp-log/types/table.columns.ts           |  6 ++++
 .../components/sftp/sftp-create-modal.vue     |  6 +++-
 .../components/sftp/sftp-table-header.vue     |  4 +--
 .../components/sftp/sftp-upload-modal.vue     |  7 ++++-
 .../handler/sftp-transfer-downloader.ts       |  2 +-
 12 files changed, 68 insertions(+), 20 deletions(-)

diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpRemoveHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpRemoveHandler.java
index 40fea27f..2b4759b6 100644
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpRemoveHandler.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpRemoveHandler.java
@@ -29,10 +29,11 @@ public class SftpRemoveHandler extends AbstractTerminalHandler<SftpBaseRequest>
     @Override
     public void handle(WebSocketSession channel, SftpBaseRequest payload) {
         long startTime = System.currentTimeMillis();
-        // 获取会话
+        String path = payload.getPath();
         String sessionId = payload.getSessionId();
+        // 获取会话
         ISftpSession session = hostTerminalManager.getSession(channel.getId(), sessionId);
-        String[] paths = payload.getPath().split("\\|");
+        String[] paths = path.split("\\|");
         log.info("SftpRemoveHandler-handle start sessionId: {}, path: {}", sessionId, Arrays.toString(paths));
         Exception ex = null;
         // 删除
@@ -53,7 +54,7 @@ public class SftpRemoveHandler extends AbstractTerminalHandler<SftpBaseRequest>
                         .build());
         // 保存操作日志
         Map<String, Object> extra = Maps.newMap();
-        extra.put(OperatorLogs.PATH, payload.getPath());
+        extra.put(OperatorLogs.PATH, path);
         this.saveOperatorLog(payload, channel,
                 extra, HostTerminalOperatorType.SFTP_REMOVE,
                 startTime, ex);
diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/utils/TransferUtils.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/utils/TransferUtils.java
index 2b2bd829..03e2bdfd 100644
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/utils/TransferUtils.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/utils/TransferUtils.java
@@ -2,6 +2,7 @@ package com.orion.visor.module.asset.handler.host.transfer.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.orion.lang.exception.argument.InvalidArgumentException;
+import com.orion.lang.utils.Strings;
 import com.orion.visor.framework.common.constant.ErrorMessage;
 import com.orion.visor.framework.websocket.core.utils.WebSockets;
 import com.orion.visor.module.asset.handler.host.transfer.enums.TransferReceiverType;
@@ -64,7 +65,11 @@ public class TransferUtils {
         if (ex == null) {
             return null;
         } else if (ex instanceof InvalidArgumentException) {
-            return ex.getMessage();
+            String message = ex.getMessage();
+            if (Strings.isBlank(message)) {
+                return ErrorMessage.OPERATE_ERROR;
+            }
+            return message;
         } else if (ex instanceof ClientAbortException) {
             return ErrorMessage.CLIENT_ABORT;
         }
diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostSftpServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostSftpServiceImpl.java
index a7fe2ce2..bf7363cb 100644
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostSftpServiceImpl.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostSftpServiceImpl.java
@@ -60,7 +60,10 @@ public class HostSftpServiceImpl implements HostSftpService {
                     vo.setHostId(extra.getLong(ExtraFieldConst.HOST_ID));
                     vo.setHostName(extra.getString(ExtraFieldConst.HOST_NAME));
                     vo.setHostAddress(extra.getString(ExtraFieldConst.ADDRESS));
-                    vo.setPaths(extra.getString(ExtraFieldConst.PATH).split("\\|"));
+                    String[] paths = Optional.ofNullable(extra.getString(ExtraFieldConst.PATH))
+                            .map(p -> p.split("\\|"))
+                            .orElse(new String[0]);
+                    vo.setPaths(paths);
                     vo.setExtra(extra);
                     return vo;
                 });
diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/utils/SftpUtils.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/utils/SftpUtils.java
index 3aa3af2b..b1c324ca 100644
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/utils/SftpUtils.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/utils/SftpUtils.java
@@ -1,8 +1,10 @@
 package com.orion.visor.module.asset.utils;
 
 import com.alibaba.fastjson.JSON;
+import com.jcraft.jsch.SftpException;
 import com.orion.lang.utils.Booleans;
 import com.orion.lang.utils.Strings;
+import com.orion.lang.utils.io.Files1;
 import com.orion.net.host.sftp.SftpExecutor;
 import com.orion.net.host.sftp.SftpFile;
 import com.orion.visor.module.asset.define.config.AppSftpConfig;
@@ -39,7 +41,12 @@ public class SftpUtils {
             SftpFileBackupParams backupParams = new SftpFileBackupParams(file.getName(), System.currentTimeMillis());
             String target = Strings.format(config.getBackupFileName(), JSON.parseObject(JSON.toJSONString(backupParams)));
             // 移动
-            executor.move(path, target);
+            try {
+                executor.getChannel().rename(path, Files1.getPath(Files1.normalize(Files1.getPath(path + "/../" + target))));
+            } catch (SftpException ignored) {
+            }
+            // FIXME kit
+            // executor.move(path, target);
         }
     }
 
diff --git a/orion-visor-ui/src/api/asset/host-sftp.ts b/orion-visor-ui/src/api/asset/host-sftp.ts
index d874bbd8..26e13c2a 100644
--- a/orion-visor-ui/src/api/asset/host-sftp.ts
+++ b/orion-visor-ui/src/api/asset/host-sftp.ts
@@ -41,6 +41,7 @@ export interface HostSftpLogQueryResponse extends TableData {
 export interface HostSftpLogExtra {
   mod: number;
   target: string;
+  maxCount: number;
 }
 
 /**
diff --git a/orion-visor-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue b/orion-visor-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue
index d34ab08b..7f7c8a93 100644
--- a/orion-visor-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue
+++ b/orion-visor-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue
@@ -107,10 +107,14 @@
           {{ getDictValue(sftpOperatorTypeKey, record.type) }}
         </a-tag>
       </template>
+      <!-- 文件数量 -->
+      <template #fileCount="{ record }">
+        <b class="span-blue">{{ record.paths.length }}</b> 个
+      </template>
       <!-- 操作文件 -->
       <template #paths="{ record }">
         <div class="paths-wrapper">
-          <span v-for="path in record.paths"
+          <span v-for="path in record.paths.slice(0, record.extra.maxCount)"
                 class="path-wrapper text-ellipsis text-copy"
                 :title="path"
                 @click="copy(path)">
@@ -125,6 +129,13 @@
             提权 {{ record.extra?.mod }} {{ permission10toString(record.extra?.mod as number) }}
           </span>
         </div>
+        <!-- 查看更多-->
+        <div v-if="record.paths.length > record.extra.maxCount"
+             class="paths-wrapper span-blue pointer"
+             title="查看更多"
+             @click="() => record.extra.maxCount = record.paths.length">
+          查看更多
+        </div>
       </template>
       <!-- 执行结果 -->
       <template #result="{ record }">
@@ -175,7 +186,7 @@
   import type { HostSftpLogQueryRequest, HostSftpLogQueryResponse } from '@/api/asset/host-sftp';
   import { reactive, ref, onMounted } from 'vue';
   import { getHostSftpLogPage, deleteHostSftpLog } from '@/api/asset/host-sftp';
-  import { sftpOperatorTypeKey, sftpOperatorResultKey, SftpOperatorType } from '../types/const';
+  import { sftpOperatorTypeKey, sftpOperatorResultKey, SftpOperatorType, showPathMaxCount } from '../types/const';
   import { usePagination, useRowSelection } from '@/types/table';
   import { useDictStore } from '@/store';
   import { Message } from '@arco-design/web-vue';
@@ -186,14 +197,13 @@
   import UserSelector from '@/components/user/user/selector/index.vue';
   import HostSelector from '@/components/asset/host/selector/index.vue';
 
-  const tableRenderData = ref<HostSftpLogQueryResponse[]>([]);
-  const selectedKeys = ref<number[]>([]);
-
   const pagination = usePagination();
   const rowSelection = useRowSelection();
   const { loading, setLoading } = useLoading();
   const { toOptions, getDictValue } = useDictStore();
 
+  const tableRenderData = ref<Array<HostSftpLogQueryResponse>>([]);
+  const selectedKeys = ref<Array<number>>([]);
   const formModel = reactive<HostSftpLogQueryRequest>({
     userId: undefined,
     hostId: undefined,
@@ -206,7 +216,12 @@
   const doFetchTableData = async (request: HostSftpLogQueryRequest) => {
     try {
       setLoading(true);
+      // 查询
       const { data } = await getHostSftpLogPage(request);
+      // 设置最大数量
+      data.rows.forEach(s => {
+        s.extra.maxCount = showPathMaxCount;
+      });
       tableRenderData.value = data.rows;
       pagination.total = data.total;
       pagination.current = request.page;
@@ -240,13 +255,11 @@
   };
 
   // 删除当前行
-  const deleteRow = async ({ id }: {
-    id: number
-  }) => {
+  const deleteRow = async (record: HostSftpLogQueryResponse) => {
     try {
       setLoading(true);
       // 调用删除接口
-      await deleteHostSftpLog([id]);
+      await deleteHostSftpLog([record.id]);
       Message.success('删除成功');
       selectedKeys.value = [];
       // 重新加载数据
diff --git a/orion-visor-ui/src/views/asset-audit/sftp-log/types/const.ts b/orion-visor-ui/src/views/asset-audit/sftp-log/types/const.ts
index 1ddadbb6..6551eba1 100644
--- a/orion-visor-ui/src/views/asset-audit/sftp-log/types/const.ts
+++ b/orion-visor-ui/src/views/asset-audit/sftp-log/types/const.ts
@@ -4,6 +4,9 @@ export const SftpOperatorType = {
   SFTP_CHMOD: 'host-terminal:sftp-chmod',
 };
 
+// 最大展示数量
+export const showPathMaxCount = 5;
+
 // sftp 操作类型 字典项
 export const sftpOperatorTypeKey = 'sftpOperatorType';
 
diff --git a/orion-visor-ui/src/views/asset-audit/sftp-log/types/table.columns.ts b/orion-visor-ui/src/views/asset-audit/sftp-log/types/table.columns.ts
index 8c9a539d..badab4a8 100644
--- a/orion-visor-ui/src/views/asset-audit/sftp-log/types/table.columns.ts
+++ b/orion-visor-ui/src/views/asset-audit/sftp-log/types/table.columns.ts
@@ -29,6 +29,12 @@ const columns = [
     slotName: 'type',
     width: 116,
     align: 'left',
+  }, {
+    title: '文件数量',
+    dataIndex: 'fileCount',
+    slotName: 'fileCount',
+    align: 'left',
+    width: 100,
   }, {
     title: '操作文件',
     dataIndex: 'paths',
diff --git a/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-create-modal.vue b/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-create-modal.vue
index 181e1791..db9bc286 100644
--- a/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-create-modal.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-create-modal.vue
@@ -50,7 +50,11 @@
   // 打开新增
   const open = (session: string, path: string, isTouch: boolean) => {
     sessionId.value = session;
-    formModel.value.path = path;
+    if (path === '/') {
+      formModel.value.path = path;
+    } else {
+      formModel.value.path = path + '/';
+    }
     touch.value = isTouch;
     setVisible(true);
     // 自动聚焦
diff --git a/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-table-header.vue b/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-table-header.vue
index d965fbbd..a22f0ed5 100644
--- a/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-table-header.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-table-header.vue
@@ -285,12 +285,12 @@
 
   // 创建文件
   const createFile = () => {
-    openSftpCreateModal(props.session?.sessionId as string, props.currentPath + '/', true);
+    openSftpCreateModal(props.session?.sessionId as string, props.currentPath, true);
   };
 
   // 创建文件夹
   const createDir = () => {
-    openSftpCreateModal(props.session?.sessionId as string, props.currentPath + '/', false);
+    openSftpCreateModal(props.session?.sessionId as string, props.currentPath, false);
   };
 
   // 删除选中文件
diff --git a/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-upload-modal.vue b/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-upload-modal.vue
index 76a9ac9c..8627bfbc 100644
--- a/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-upload-modal.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-upload-modal.vue
@@ -106,7 +106,8 @@
       return false;
     }
     if (!fileList.value.length) {
-      return true;
+      Message.error('请选择文件');
+      return false;
     }
     // 添加到上传列表
     const files = fileList.value.map(s => s.file as File);
@@ -168,6 +169,10 @@
       margin-right: 0 !important;
     }
 
+    :deep(.arco-upload-list-item-name-link) {
+      width: 100%;
+    }
+
     :deep(.arco-upload-list-item-name-text) {
       width: 100%;
     }
diff --git a/orion-visor-ui/src/views/host/terminal/handler/sftp-transfer-downloader.ts b/orion-visor-ui/src/views/host/terminal/handler/sftp-transfer-downloader.ts
index e8cb6667..4c64cf09 100644
--- a/orion-visor-ui/src/views/host/terminal/handler/sftp-transfer-downloader.ts
+++ b/orion-visor-ui/src/views/host/terminal/handler/sftp-transfer-downloader.ts
@@ -3,7 +3,7 @@ import { TransferOperatorType, TransferStatus } from '../types/terminal.const';
 import { getFileName, getPath } from '@/utils/file';
 import { saveAs } from 'file-saver';
 
-// sftp 上传器实现
+// sftp 下载器实现
 export default class SftpTransferDownloader implements ISftpTransferDownloader {
 
   public abort: boolean;