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

添加mac

Browse Source
This commit is contained in:
jiangzeyin 2019-04-28 22:10:52 +08:00
parent 88c92699d4
commit ec0799a4d4
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/agent/src/main/java/cn/keepbx/jpom/common/commander/AbstractProjectCommander.java
View File

@ -71,6 +71,8 @@ public abstract class AbstractProjectCommander {
} else if (BaseJpomApplication.OS_INFO.isWindows()) {
// Windows系统
abstractProjectCommander = new WindowsProjectCommander();
} else if (BaseJpomApplication.OS_INFO.isMac()) {
abstractProjectCommander = new LinuxProjectCommander();
} else {
throw new JpomRuntimeException("不支持的：" + BaseJpomApplication.OS_INFO.getName());
}

2
modules/agent/src/main/java/cn/keepbx/jpom/common/commander/AbstractSystemCommander.java
View File

@ -31,6 +31,8 @@ public abstract class AbstractSystemCommander {
} else if (BaseJpomApplication.OS_INFO.isWindows()) {
// Windows系统
abstractSystemCommander = new WindowsSystemCommander();
} else if (BaseJpomApplication.OS_INFO.isMac()) {
abstractSystemCommander = new LinuxSystemCommander();
} else {
throw new JpomRuntimeException("不支持的：" + BaseJpomApplication.OS_INFO.getName());
}

2
modules/common/src/main/java/cn/keepbx/jpom/BaseJpomApplication.java
View File

@ -52,6 +52,8 @@ public abstract class BaseJpomApplication {
if (charset == null) {
if (OS_INFO.isLinux()) {
charset = CharsetUtil.CHARSET_UTF_8;
} else if (OS_INFO.isMac()) {
charset = CharsetUtil.CHARSET_UTF_8;
} else {
charset = CharsetUtil.CHARSET_GBK;
}

15
modules/server/src/main/resources/vm/node/manage/filemanage.vm
View File

@ -22,7 +22,7 @@
}
.ztree {
height: 90vh;
height: 80vh;
overflow-x: scroll;
padding: 10px;
}
@ -48,6 +48,7 @@
</div>
<div class="layui-row">
<div class="layui-col-md3">
<div class="layui-text" style="padding-top: 20px;">当前操作子级：<span id="currentPath"></span></div>
<ul id="tree" class="ztree"></ul>
</div>
<div class="layui-col-md9">
@ -134,7 +135,10 @@
elem: '#uploadFile',
accept: 'file',
data: {
id: '$id'
id: '$id',
levelName: function () {
}
},
multiple: true,
url: './upload',
@ -231,7 +235,7 @@
}
});
// 点击'上传文件'事件
//
$('#clear').on('click', function () {
layer.confirm('确定清空此项目文件吗(包括子目录)？', {
title: '系统提示'
@ -246,7 +250,9 @@
success: function (data) {
layer.msg(data.msg);
if (200 === data.code) {
reloadTable();
setTimeout(function () {
location.reload();
}, 1500);
}
}
});
@ -286,6 +292,7 @@
} else {
filePath = (treeNode.levelName || "") + "/" + treeNode.filename;
}
$("#currentPath").text(filePath);
tableWhre.path = filePath;
reloadTable();
}