test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-11-30 02:48:17 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

update ssh upload

Browse Source
This commit is contained in:
bwcx_jzy 2022-01-21 15:43:16 +08:00
parent e54f1b462c
commit 47cfce70d9
No known key found for this signature in database
GPG Key ID: 5E48E9372088B9E5
4 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PLANS.md
View File

@ -15,6 +15,7 @@
9. 容器构建
10. docker ui
11. 节点大屏
12. 实时阅读日志文件
# 2.7.x

4
README.md
View File

@ -315,6 +315,10 @@ Agent.sh create 创建Jpom插件端的应用服务（jpom-agent）
[名词解释](https://jpom.io/docs/index.html#/FQA/%E5%90%8D%E8%AF%8D%E8%A7%A3%E9%87%8A)
## 整体架构
![jpom-func-arch](https://cdn.jsdelivr.net/gh/jiangzeyin/Jpom-site/images/jpom-func-arch.jpg)
### 交流讨论 、提供bug反馈或建议
1. 微信群二维码（添加小助手：备注Jpom 进群）

36
modules/server/src/main/java/io/jpom/build/ReleaseManage.java
View File

@ -251,24 +251,30 @@ public class ReleaseManage extends BaseBuild {
}
Session session = SshService.getSessionByModel(item);
try {
try (Sftp sftp = new Sftp(session, item.getCharsetT())) {
if (this.buildExtraModule.isClearOld() && StrUtil.isNotEmpty(this.buildExtraModule.getReleasePath())) {
try {
sftp.delDir(this.buildExtraModule.getReleasePath());
} catch (Exception e) {
if (!StrUtil.startWithIgnoreCase(e.getMessage(), "No such file")) {
this.pubLog("清除构建产物失败", e);
String releasePath = this.buildExtraModule.getReleasePath();
if (StrUtil.isEmpty(releasePath)) {
this.log("发布目录为空");
} else {
try (Sftp sftp = new Sftp(session, item.getCharsetT())) {
String prefix = "";
if (!StrUtil.startWith(releasePath, StrUtil.SLASH)) {
prefix = sftp.pwd();
}
String normalizePath = FileUtil.normalize(prefix + StrUtil.SLASH + releasePath);
if (this.buildExtraModule.isClearOld()) {
try {
sftp.delDir(normalizePath);
} catch (Exception e) {
if (!StrUtil.startWithIgnoreCase(e.getMessage(), "No such file")) {
this.pubLog("清除构建产物失败", e);
}
}
}
sftp.syncUpload(this.resultFile, normalizePath);
this.log("ssh ftp upload done");
} catch (Exception e) {
this.pubLog("执行ssh发布异常", e);
}
String prefix = "";
if (!StrUtil.startWith(this.buildExtraModule.getReleasePath(), StrUtil.SLASH)) {
prefix = sftp.pwd();
}
String normalizePath = FileUtil.normalize(prefix + StrUtil.SLASH + this.buildExtraModule.getReleasePath());
sftp.syncUpload(this.resultFile, normalizePath);
} catch (Exception e) {
this.pubLog("执行ssh发布异常", e);
}
} finally {
JschUtil.close(session);

10
web-vue/src/pages/node/node-layout/index.vue
View File

@ -166,15 +166,15 @@ export default {
},
};
</script>
<style scoped>
<style scoped lang="stylus">
.node-sider {
/* height: calc(100vh - 75px); */
min-height: calc(100vh);
/* height: calc(100vh - 80px); */
min-height: calc(100vh - 85px);
overflow-y: auto;
}
.layout-content {
/* min-height: calc(100vh); */
/* overflow-y: auto; */
min-height: calc(100vh - 85px);
overflow-y: auto;
}
/* .node-layout {
padding: 10px;