From 4f684dabcb2dba92b85f096bb32c8ab5707e764f Mon Sep 17 00:00:00 2001
From: wxyShine <wxyrrcj@gmail.com>
Date: Fri, 8 Apr 2022 17:02:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?:tada:SSH=E6=96=87=E4=BB=B6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=99=A8=E4=B8=AD=E5=8A=A0=E5=85=A5=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=92=8C=E6=96=87=E4=BB=B6=E7=9A=84=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ssh/SshFileController.java     | 30 +++++-
 web-vue/src/api/ssh.js                        | 14 +++
 web-vue/src/pages/ssh/ssh-file.vue            | 98 ++++++++++++++++---
 3 files changed, 126 insertions(+), 16 deletions(-)

diff --git a/modules/server/src/main/java/io/jpom/controller/ssh/SshFileController.java b/modules/server/src/main/java/io/jpom/controller/ssh/SshFileController.java
index 09fc3117b..41840c875 100644
--- a/modules/server/src/main/java/io/jpom/controller/ssh/SshFileController.java
+++ b/modules/server/src/main/java/io/jpom/controller/ssh/SshFileController.java
@@ -452,7 +452,7 @@ public class SshFileController extends BaseServerController {
             File savePath = FileUtil.file(tempPath, "ssh", sshModel.getId());
             multipart.setSavePath(FileUtil.getAbsolutePath(savePath));
             multipart.addFieldName("file")
-                    .setUseOriginalFilename(true);
+                .setUseOriginalFilename(true);
             //
             if (Convert.toBool(unzip, false)) {
                 multipart.setFileExt(StringUtil.PACKAGE_EXT);
@@ -489,4 +489,32 @@ public class SshFileController extends BaseServerController {
         return JsonMessage.getString(200, "上传成功");
     }
 
+    @RequestMapping(value = "new_file_folder.json", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+    public String newFileFolder(String id, String path, String name, String unFolder) {
+        SshModel sshModel = sshService.getByKey(id, false);
+        Assert.notNull(sshModel, "ssh error");
+        Session session = SshService.getSessionByModel(sshModel);
+        try (Sftp sftp = new Sftp(session, sshModel.getCharsetT())) {
+            // 验证合法性，防止越权
+            FileUtil.file(path, name);
+            String remotePath = FileUtil.normalize(path + StrUtil.SLASH + name);
+            StringBuilder command = new StringBuilder();
+            if (Convert.toBool(unFolder, false)) {
+                // 文件
+                command.append("touch ").append(remotePath);
+            } else {
+                // 目录
+                command.append("mkdir ").append(remotePath);
+                if (sftp.mkdir(remotePath)) {
+                }
+            }
+            String result = sshService.exec(sshModel, String.valueOf(command));
+            return JsonMessage.getString(200, "操作成功");
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return JsonMessage.getString(400, "操作失败");
+    }
+
 }
diff --git a/web-vue/src/api/ssh.js b/web-vue/src/api/ssh.js
index 99c803ed2..2feddbc79 100644
--- a/web-vue/src/api/ssh.js
+++ b/web-vue/src/api/ssh.js
@@ -225,3 +225,17 @@ export function updateFileData(params) {
     data: params,
   });
 }
+
+/**
+ * 新增目录  或文件
+ * @param params
+ * @returns {id, path, name,unFolder} params x
+ */
+export function newFileFolder(params) {
+    return axios({
+        url: "/node/ssh/new_file_folder.json",
+        method: "post",
+        data: params,
+    });
+}
+
diff --git a/web-vue/src/pages/ssh/ssh-file.vue b/web-vue/src/pages/ssh/ssh-file.vue
index d51f1e854..316af7974 100644
--- a/web-vue/src/pages/ssh/ssh-file.vue
+++ b/web-vue/src/pages/ssh/ssh-file.vue
@@ -3,8 +3,8 @@
   <a-layout class="ssh-file-layout">
     <!-- 目录树 -->
     <a-layout-sider theme="light" class="sider" width="25%">
-      <a-empty v-if="treeList.length === 0" />
-      <a-directory-tree :treeData="treeList" :replaceFields="replaceFields" @select="onSelect"> </a-directory-tree>
+      <a-empty v-if="treeList.length === 0"/>
+      <a-directory-tree :treeData="treeList" :replaceFields="replaceFields" @select="onSelect"></a-directory-tree>
     </a-layout-sider>
     <!-- 表格 -->
     <a-layout-content class="file-content">
@@ -14,6 +14,23 @@
           <a-space>
             <a-button size="small" :disabled="!this.tempNode.parentDir" type="primary" @click="handleUpload">上传文件</a-button>
             <a-button size="small" :disabled="!this.tempNode.parentDir" type="primary" @click="handleUploadZip">上传压缩文件（自动解压）</a-button>
+            <a-dropdown :disabled="!this.tempNode.parentDir">
+              <a-button size="small" type="primary" @click="e => e.preventDefault()">新建</a-button>
+              <a-menu slot="overlay">
+                <a-menu-item>
+                  <a-space @click="handleAddFolder">
+                    <a-icon type="folder-add"/>
+                    <a-space>新建目录</a-space>
+                  </a-space>
+                </a-menu-item>
+                <a-menu-item>
+                  <a-space @click="handleAddFile">
+                    <a-icon type="file-add"/>
+                    <a-space>新建空白文件</a-space>
+                  </a-space>
+                </a-menu-item>
+              </a-menu>
+            </a-dropdown>
             <a-button size="small" :disabled="!this.tempNode.parentDir" type="primary" @click="loadFileList()">刷新</a-button>
             <a-button size="small" :disabled="!this.tempNode.parentDir" type="danger" @click="handleDeletePath()">删除</a-button>
             <span v-if="this.nowPath">当前目录:{{ this.nowPath }}</span>
@@ -32,7 +49,7 @@
         <template slot="operation" slot-scope="text, record">
           <a-space>
             <a-tooltip title="需要到 ssh 信息中配置允许编辑的文件后缀">
-              <a-button size="small" type="primary" :disabled="!record.textFileEdit" @click="handleEdit(record)">编辑 </a-button>
+              <a-button size="small" type="primary" :disabled="!record.textFileEdit" @click="handleEdit(record)">编辑</a-button>
             </a-tooltip>
             <!-- <a-button type="primary" :disabled="!record.textFileEdit" @click="handlePreview(record)">跟踪</a-button> -->
             <a-button size="small" type="primary" @click="handleDownload(record)">下载</a-button>
@@ -44,16 +61,26 @@
       <a-modal v-model="uploadFileVisible" width="300px" title="上传文件" :footer="null" :maskClosable="true">
         <a-upload :file-list="uploadFileList" :remove="handleRemove" :before-upload="beforeUpload" :accept="`${uploadFileZip ? ZIP_ACCEPT : ''}`" :multiple="!uploadFileZip">
           <a-button>
-            <a-icon type="upload" />选择文件
+            <a-icon type="upload"/>
+            选择文件
             {{ uploadFileZip ? "压缩包" : "" }}
           </a-button>
         </a-upload>
-        <br />
+        <br/>
         <a-button type="primary" :disabled="uploadFileList.length === 0" @click="startUpload">开始上传</a-button>
       </a-modal>
+      <!--  新增文件 目录    -->
+      <a-modal @cancel="closeAddFileFolder" v-model="addFileFolderVisible" width="300px" :title="addFileOrFolderTitle" :footer="null" :maskClosable="true">
+        <span v-if="this.nowPath">当前目录:{{ this.nowPath }}</span><br/>
+        <br/>
+        <a-input v-model="fileFolderName"/>
+        <br/>
+        <br/>
+        <a-button type="primary" :disabled="fileFolderName.length === 0" @click="startAddFileFolder">确认</a-button>
+      </a-modal>
       <!-- Terminal -->
       <a-modal v-model="terminalVisible" width="50%" title="Terminal" :footer="null" :maskClosable="false">
-        <terminal v-if="terminalVisible" :sshId="ssh.id" :nodeId="ssh.nodeModel.id" :tail="temp.path + temp.parentDir" />
+        <terminal v-if="terminalVisible" :sshId="ssh.id" :nodeId="ssh.nodeModel.id" :tail="temp.path + temp.parentDir"/>
       </a-modal>
       <a-modal v-model="editFileVisible" width="80vw" title="编辑文件" cancelText="关闭" :maskClosable="true" @ok="updateFileData">
         <div style="height: 60vh">
@@ -64,10 +91,11 @@
   </a-layout>
 </template>
 <script>
-import { getRootFileList, getFileList, downloadFile, deleteFile, uploadFile, readFile, updateFileData } from "@/api/ssh";
+import {getRootFileList, getFileList, downloadFile, deleteFile, uploadFile, readFile, updateFileData, newFileFolder} from "@/api/ssh";
 import Terminal from "./terminal";
 import codeEditor from "@/components/codeEditor";
-import { ZIP_ACCEPT } from "@/utils/const";
+import {ZIP_ACCEPT} from "@/utils/const";
+
 export default {
   props: {
     ssh: {
@@ -76,7 +104,7 @@ export default {
   },
   components: {
     Terminal,
-    codeEditor,
+    codeEditor
   },
   data() {
     return {
@@ -97,13 +125,18 @@ export default {
         key: "key",
       },
       columns: [
-        { title: "文件名称", dataIndex: "title", ellipsis: true, scopedSlots: { customRender: "name" } },
-        { title: "文件类型", dataIndex: "dir", width: 100, ellipsis: true, scopedSlots: { customRender: "dir" } },
-        { title: "文件大小", dataIndex: "size", width: 120, ellipsis: true, scopedSlots: { customRender: "size" } },
-        { title: "修改时间", dataIndex: "modifyTime", width: 180, ellipsis: true },
-        { title: "操作", dataIndex: "operation", align: "center", scopedSlots: { customRender: "operation" }, width: 180 },
+        {title: "文件名称", dataIndex: "title", ellipsis: true, scopedSlots: {customRender: "name"}},
+        {title: "文件类型", dataIndex: "dir", width: 100, ellipsis: true, scopedSlots: {customRender: "dir"}},
+        {title: "文件大小", dataIndex: "size", width: 120, ellipsis: true, scopedSlots: {customRender: "size"}},
+        {title: "修改时间", dataIndex: "modifyTime", width: 180, ellipsis: true},
+        {title: "操作", dataIndex: "operation", align: "center", scopedSlots: {customRender: "operation"}, width: 180},
       ],
       editFileVisible: false,
+      addFileFolderVisible: false,
+      addFileOrFolderTitle: "新增目录",
+      // 目录1 文件2 标识
+      addFileOrFolderType: 1,
+      fileFolderName: ""
     };
   },
   mounted() {
@@ -154,6 +187,39 @@ export default {
       this.handleUpload();
       this.uploadFileZip = true;
     },
+    handleAddFolder() {
+      this.addFileFolderVisible = true;
+      this.addFileOrFolderType = 1;
+      this.addFileOrFolderTitle = "新增目录";
+    },
+    handleAddFile() {
+      this.addFileFolderVisible = true;
+      this.addFileOrFolderType = 2;
+      this.addFileOrFolderTitle = "新增文件";
+    },
+    closeAddFileFolder() {
+      this.addFileFolderVisible = false;
+      this.fileFolderName = "";
+    },
+    // 确认新增文件  目录
+    startAddFileFolder() {
+      const params = {
+        id: this.ssh.id,
+        path: this.nowPath,
+        name: this.fileFolderName,
+        unFolder: this.addFileOrFolderType === 1 ? false : true
+      };
+      newFileFolder(params).then(res => {
+        if (res.code === 200) {
+          this.$notification.success({
+            message: res.msg,
+          });
+          this.loadFileList();
+          this.fileFolderName = "";
+          this.addFileFolderVisible = false;
+        }
+      })
+    },
     handleRemove(file) {
       const index = this.uploadFileList.indexOf(file);
       const newFileList = this.uploadFileList.slice();
@@ -187,7 +253,7 @@ export default {
       });
     },
     // 选中目录
-    onSelect(selectedKeys, { node }) {
+    onSelect(selectedKeys, {node}) {
       return new Promise((resolve) => {
         this.tempNode = node.dataRef;
         if (node.dataRef.disabled) {
@@ -387,11 +453,13 @@ export default {
   padding: 0;
   min-height calc(100vh - 75px);
 }
+
 .sider {
   border: 1px solid #e2e2e2;
   /* height: calc(100vh - 80px); */
   /* overflow-y: auto; */
 }
+
 .file-content {
   /* height: calc(100vh - 100px); */
   /* overflow-y: auto; */
-- 
Gitee


From 3ce8da56de686892994da91ba1a5ebdd838bf956 Mon Sep 17 00:00:00 2001
From: wxyShine <wxyrrcj@gmail.com>
Date: Fri, 8 Apr 2022 17:31:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?:bug:=20SHH=E6=96=87=E4=BB=B6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=B8=AD=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0,?=
 =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E5=8C=85=E4=B8=8A=E4=BC=A0,=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=93=8D=E4=BD=9C;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web-vue/src/pages/ssh/ssh-file.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/web-vue/src/pages/ssh/ssh-file.vue b/web-vue/src/pages/ssh/ssh-file.vue
index 316af7974..56f1c1bdf 100644
--- a/web-vue/src/pages/ssh/ssh-file.vue
+++ b/web-vue/src/pages/ssh/ssh-file.vue
@@ -58,7 +58,7 @@
         </template>
       </a-table>
       <!-- 上传文件 -->
-      <a-modal v-model="uploadFileVisible" width="300px" title="上传文件" :footer="null" :maskClosable="true">
+      <a-modal @cancel="closeUploadFile" v-model="uploadFileVisible" width="300px" title="上传文件" :footer="null" :maskClosable="true">
         <a-upload :file-list="uploadFileList" :remove="handleRemove" :before-upload="beforeUpload" :accept="`${uploadFileZip ? ZIP_ACCEPT : ''}`" :multiple="!uploadFileZip">
           <a-button>
             <a-icon type="upload"/>
@@ -215,8 +215,7 @@ export default {
             message: res.msg,
           });
           this.loadFileList();
-          this.fileFolderName = "";
-          this.addFileFolderVisible = false;
+          this.closeAddFileFolder()
         }
       })
     },
@@ -230,6 +229,9 @@ export default {
       this.uploadFileList = [...this.uploadFileList, file];
       return false;
     },
+    closeUploadFile(){
+      this.uploadFileList = [];
+    },
     // 开始上传文件
     startUpload() {
       this.uploadFileList.forEach((file) => {
@@ -246,7 +248,7 @@ export default {
               message: res.msg,
             });
             this.loadFileList();
-            this.uploadFileList = [];
+            this.closeUploadFile()
             this.uploadFileVisible = false;
           }
         });
-- 
Gitee