diff --git a/README.md b/README.md index 3a1061b7ba8db152133da1f52683a948b24cedc8..aab4d5d5c3fd30b5301debbdc6199759daf20ec3 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,12 @@ server { proxy_pass http://go-admin-server; rewrite ^\/bg-(.*)$ /$1 break; } + location /bg-admin/devops/explorer/sftp/upload { + client_max_body_size 1g; + client_body_buffer_size 2m; + proxy_pass http://go-admin-server; + rewrite ^\/bg-(.*)$ /$1 break; + } } ``` 5. 启动nginx服务即可。 \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 6c8dc93a5f16db644fc136d6964f4e13741e7a1d..6818adba83a1d679ee7bd500b482710cc19c6b7d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@xterm/addon-canvas": "^0.6.0", "@xterm/addon-fit": "^0.9.0", "@xterm/xterm": "^5.4.0", - "axios": "^1.6.7", + "axios": "^1.7.7", "echarts": "^5.5.0", "element-plus": "^2.6.1", "moment": "^2.30.1", @@ -690,9 +690,9 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/axios": { - "version": "1.6.8", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz", - "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==", + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", + "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", diff --git a/package.json b/package.json index c6dab944d125e5f9c472ea9a07291bebeb1ff402..1d9a15ba6cb13fb6af5b8aa99be2e3c06fb67cac 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "@xterm/addon-canvas": "^0.6.0", "@xterm/addon-fit": "^0.9.0", "@xterm/xterm": "^5.4.0", - "axios": "^1.6.7", + "axios": "^1.7.7", "echarts": "^5.5.0", "element-plus": "^2.6.1", "moment": "^2.30.1", diff --git a/src/assets/css/devops/explorer.css b/src/assets/css/devops/explorer.css index 3671e477dfa9ca4391548c35872707a8014a85d9..edc854a83016de82bd92197fa9a3d28e08c35c41 100644 --- a/src/assets/css/devops/explorer.css +++ b/src/assets/css/devops/explorer.css @@ -1,3 +1,4 @@ +@import "../dialog_common.css"; .container { display: flex; flex-direction: column; @@ -8,6 +9,7 @@ flex-wrap: nowrap; padding: 10px; border-bottom: 1px solid #cccccc; + flex: none; } .head .arrow-icon { margin: 0 6px; @@ -32,14 +34,12 @@ margin: 0 15px; cursor: pointer; } -.head .upload_btn { - margin-right: 20px; -} .list { padding: 20px; display: flex; flex-wrap: wrap; align-content: flex-start; + flex: 1; } .item_v { width: 100px; diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 858df14ecfe5c636b0e2afd0cbb9bde0416061de..c5b725c572c2e48bceeacd76a7f4d2cedea37735 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -214,4 +214,8 @@ a { } ._drawer .block .row .value { flex: none; +} + +.tooltip { + max-width: 50%; } \ No newline at end of file diff --git a/src/router.js b/src/router.js index 9778c5062b8c6d8ab2a8db224d319c5de59d008d..b00163d51c44c38de825e533fab36701be45e322 100644 --- a/src/router.js +++ b/src/router.js @@ -18,6 +18,7 @@ import Performance from "./views/devops/monitor/performance/index.vue" import PerformanceDetail from "./views/devops/monitor/performance/detail.vue" import Host from "./views/devops/host/index.vue" import HostXterm from "./views/devops/host/xterm.vue" +import HostExplorer from "./views/devops/host/explorer.vue" import Group from "./views/devops/group/index.vue" import App from "./views/devops/app/index.vue" import Script from "./views/devops/script/index.vue" @@ -43,6 +44,7 @@ const router = [ {path: "/devops/monitor/performance/detail", component: PerformanceDetail}, {path: "/devops/host", component: Host}, {path: "/devops/host/terminal", component: HostXterm}, + {path: "/devops/host/explorer", component: HostExplorer}, {path: "/devops/group", component: Group}, {path: "/devops/app", component: App}, {path: "/devops/script", component: Script}, diff --git a/src/settings.js b/src/settings.js index 5e3c25a8ddc1faa9fde497531a51aa2bd665be8f..0096c3568fde6eb166fccad5020ff3b84376dbd1 100644 --- a/src/settings.js +++ b/src/settings.js @@ -121,6 +121,15 @@ const serverPaths = { explorerDelete: serverContextPath + "/devops/explorer/entry", explorerUpload: serverContextPath + "/devops/explorer/upload", explorerDownload: serverContextPath + "/devops/explorer/download", + explorerCreate: serverContextPath + "/devops/explorer/create", + explorerRename: serverContextPath + "/devops/explorer/rename", + // host explorer + hostExplorerEntries: serverContextPath + "/devops/explorer/sftp/entries", + hostExplorerDelete: serverContextPath + "/devops/explorer/sftp/entry", + hostExplorerUpload: serverContextPath + "/devops/explorer/sftp/upload", + hostExplorerDownload: serverContextPath + "/devops/explorer/sftp/download", + hostExplorerCreate: serverContextPath + "/devops/explorer/sftp/create", + hostExplorerRename: serverContextPath + "/devops/explorer/sftp/rename", } export { serverPaths, diff --git a/src/views/devops/app/index.vue b/src/views/devops/app/index.vue index c2882d287f77a47369d15e93c1dc2e1386571baf..6af0d5b9e1b786e0d853cff470cf48feba94c444 100644 --- a/src/views/devops/app/index.vue +++ b/src/views/devops/app/index.vue @@ -9,12 +9,12 @@ 新增 - - + + - - + + @@ -310,7 +310,4 @@ function handleDownload() { } \ No newline at end of file diff --git a/src/views/devops/explorer/index.vue b/src/views/devops/explorer/index.vue index c72460b1550524dfa25e656ccbcf4e70b56c0303..76a7fb7652d194a3663b1e227256cba012898747 100644 --- a/src/views/devops/explorer/index.vue +++ b/src/views/devops/explorer/index.vue @@ -10,6 +10,7 @@ 上传 + 创建目录 @@ -19,6 +20,7 @@ 打开 + 重命名 删除 @@ -30,8 +32,9 @@ - 删除 下载 + 重命名 + 删除 @@ -58,13 +61,34 @@ + + + + 名称 + + + + 取消 + 确定 + + + + + + 新名称 + + + + 取消 + 确定 + + + \ No newline at end of file diff --git a/src/views/devops/host/index.vue b/src/views/devops/host/index.vue index 69a08b010a8149abffa2a6bae74cf48c7f3ab260..9993aa5edd47967684b2b1183c978dc92eff7f39 100644 --- a/src/views/devops/host/index.vue +++ b/src/views/devops/host/index.vue @@ -9,17 +9,18 @@ 新增 - - + + - + 编辑 删除 Shell + SFTP @@ -254,7 +255,10 @@ function connectTest() { function openShell(host) { router.push("/devops/host/terminal?id=" + host.id) } + +function openExplorer(host) { + router.push("/devops/host/explorer?id=" + host.id + "&user=" + host.user + "&ip=" + host.ip) +} \ No newline at end of file diff --git a/src/views/devops/monitor/performance/index.vue b/src/views/devops/monitor/performance/index.vue index 6917d654df5373376b277c86af5548dc75353058..0023b452631a0aa5dd6acb83a65eaf39c4ff8154 100644 --- a/src/views/devops/monitor/performance/index.vue +++ b/src/views/devops/monitor/performance/index.vue @@ -8,7 +8,7 @@ 搜索 - + diff --git a/src/views/devops/script/index.vue b/src/views/devops/script/index.vue index fa9936421729c67dbc104733ea6a7815afe546c2..5e27dfed4660dd92c3e8d8f4642075a7b4a65349 100644 --- a/src/views/devops/script/index.vue +++ b/src/views/devops/script/index.vue @@ -9,7 +9,7 @@ 新增 - + @@ -20,7 +20,7 @@ - + diff --git a/src/views/devops/task/index.vue b/src/views/devops/task/index.vue index 113c86a8b682c79fc02cf17fa309ca908f9057e7..2eb6706de6804a3104f453487e7442d03bffa310 100644 --- a/src/views/devops/task/index.vue +++ b/src/views/devops/task/index.vue @@ -9,9 +9,9 @@ 新增 - - - + + + diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 3c381d9e086306be81378f020bc1101c8684b04e..4925f81ec18c27ec67d01ce70343754410362b47 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -9,8 +9,8 @@ 新增 - - + + diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue index 326e24d50a8e01504697ca1b4bfeb583a03d4275..5e3cd21fa6225aaa1c3a6a63931b1bd03ce43699 100644 --- a/src/views/system/job/index.vue +++ b/src/views/system/job/index.vue @@ -9,7 +9,7 @@ 新增 - + @@ -172,5 +172,4 @@ function doDeleteJob() { } \ No newline at end of file diff --git a/src/views/system/log/login/index.vue b/src/views/system/log/login/index.vue index 8cef4ff5a7ac8389d2c4bceeaaac3eb2f5e497e1..b0dcc8338831f2c5c425ca40edcd43764f43d0fc 100644 --- a/src/views/system/log/login/index.vue +++ b/src/views/system/log/login/index.vue @@ -133,7 +133,4 @@ function doClearLog() { } \ No newline at end of file diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index b29e95fc8e4472579423f59c47d0fab7e58cfb6d..d1c0f3456d3011ea8c9f3a16a9433b396659331f 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -9,8 +9,8 @@ 新增 - - + + diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 37c354b61049e5f9a270c75125400f0c62b3ea6f..46629b7e8b8459c3177df337ee29763039c63c70 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -20,8 +20,8 @@ 新增 - - + +