Commit Graph

450 Commits

Author SHA1 Message Date
Arno
69b8064839 !62 合并
Merge pull request !62 from Arno/dev
2019-03-22 11:10:13 +08:00
Arno
b7c9aee0fc !61 首页进程列表
Merge pull request !61 from Arno/dyc
2019-03-22 11:09:41 +08:00
Arno
595c4fa017 首页进程列表 2019-03-22 11:08:58 +08:00
jiangzeyin
e706658617 方法统一 2019-03-22 09:19:24 +08:00
Arno
e82edc87d1 !60 取消重复加载Echarts
Merge pull request !60 from Arno/dyc
2019-03-21 19:56:27 +08:00
ArnoHand
5497d6a38a 取消重复加载Echarts 2019-03-21 19:46:41 +08:00
Arno
1160eec5f7 !59 windows首页开启监听修改
Merge pull request !59 from Arno/dyc
2019-03-21 19:35:25 +08:00
ArnoHand
b50dfd7a55 windows首页开启监听修改 2019-03-21 19:34:48 +08:00
Arno
fdb0442aa0 !58 windows首页监控
Merge pull request !58 from Arno/dyc
2019-03-21 19:12:48 +08:00
ArnoHand
8c230ab4f0 windows首页监控 2019-03-21 18:39:35 +08:00
jiangzeyin
452382c970 用户登录名限制 2019-03-21 17:57:11 +08:00
jiangzeyin
1badd05ff0 日志扫描备份参数配置 2019-03-21 16:48:40 +08:00
Arno
5d42d8fc82 !57 nginx根据证书id选择证书
Merge pull request !57 from Arno/dyc
2019-03-21 16:19:58 +08:00
ArnoHand
2d055c7676 nginx根据证书id选择证书 2019-03-21 16:19:04 +08:00
jiangzeyin
ff5d4dc73c 最后修改人 2019-03-21 16:16:13 +08:00
Arno
ab78676b27 !56 证书添加name
Merge pull request !56 from Arno/dyc
2019-03-21 16:12:27 +08:00
ArnoHand
b6105394a5 证书添加name 2019-03-21 16:11:40 +08:00
jiangzeyin
aec74d205f update url 2019-03-21 15:58:33 +08:00
jiangzeyin
5fdc3658bc update url 2019-03-21 15:53:11 +08:00
jiangzeyin
4e7b3914fc 更新说明 2019-03-21 15:32:47 +08:00
jiangzeyin
715d91fd6a 更新说明 2019-03-21 15:27:15 +08:00
不忘初心
f95f223e0b !55 合并
Merge pull request !55 from Arno/dev
2019-03-21 15:17:41 +08:00
jiangzeyin
58b8aff1df 2.0 证书支持手动写json,读取信息 2019-03-21 15:16:01 +08:00
jiangzeyin
403cc4a103 修护bat命令 2019-03-21 12:07:57 +08:00
Arno
86cec1bfb2 !54 合并
Merge pull request !54 from Arno/dev
2019-03-21 11:47:07 +08:00
BuildTools
19e1be2a78 Merge remote-tracking branch 'origin/dev' into dev 2019-03-21 11:21:55 +08:00
BuildTools
a34a763b6d 启动命令修复 2019-03-21 11:21:28 +08:00
Arno
765e193cc7 !53 回收站详情请求接口,监控增加jvm内存
Merge pull request !53 from Arno/dyc
2019-03-21 11:17:07 +08:00
ArnoHand
844ae65f7e 回收站详情请求接口,监控增加jvm内存 2019-03-21 11:16:12 +08:00
BuildTools
0f5c484c56 代码优化 2019-03-21 10:21:52 +08:00
BuildTools
5fceb0600c Merge remote-tracking branch 'origin/dev' into dev 2019-03-21 10:18:17 +08:00
BuildTools
5315faaf9e 将启动命令打包到根目录 2019-03-21 10:17:07 +08:00
BuildTools
d808fd09c6 Windows下的Jpom启动命令 2019-03-21 10:12:06 +08:00
jiangzeyin
d202bc0a7b nginx 导入数据获取白名单路径方式 2019-03-20 22:57:36 +08:00
Arno
ff8b2f71cb !52 上传配置文件
Merge pull request !52 from Arno/dyc
2019-03-20 18:27:48 +08:00
ArnoHand
22640b085b 上传配置修改 2019-03-20 18:25:59 +08:00
Arno
3243ec0dfd !51 合并
Merge pull request !51 from Arno/dev
2019-03-20 16:28:30 +08:00
Arno
02a75d2c00 !50 回收站
Merge pull request !50 from Arno/dyc
2019-03-20 16:27:53 +08:00
jiangzeyin
b0eaea46ed 导入nginx 调整... 2019-03-20 16:27:15 +08:00
ArnoHand
5d3b1815a0 回收站 2019-03-20 16:27:04 +08:00
jiangzeyin
1e8f915de5 Merge remote-tracking branch 'gitee/dev' into dev 2019-03-20 15:07:08 +08:00
jiangzeyin
eb834910de 用户id 特殊字符限制,file 安全 2019-03-20 15:06:56 +08:00
不忘初心
34d0d8bb0d !49 监控端口修改
Merge pull request !49 from Arno/dyc
2019-03-20 14:58:17 +08:00
jiangzeyin
746f04c0e2 清理默认数据文件 2019-03-20 14:56:09 +08:00
不忘初心
c780e3a9dd !48 合并
Merge pull request !48 from Arno/dev
2019-03-20 14:37:07 +08:00
jiangzeyin
19b9a07ad1 编辑项目提示,保存数据不存在 2019-03-20 14:36:39 +08:00
ArnoHand
91878041d2 监控端口修改 2019-03-20 12:13:19 +08:00
不忘初心
12fe09c8d3 !47 合并
Merge pull request !47 from Arno/dev
2019-03-20 10:29:28 +08:00
jiangzeyin
9b3c609820 获取jvm 新兼容,系统管理员名称占用 2019-03-20 10:00:37 +08:00
Arno
e60c908d06 !46 监控端口修改
Merge pull request !46 from Arno/dyc
2019-03-20 09:22:16 +08:00