Commit Graph

410 Commits

Author SHA1 Message Date
凌云
fbb2edfdf9 内存 CPU上报保留二位小数~ 2020-04-16 18:07:13 +08:00
凌云
488b136922 解决上报内存不准,CPU与内存上报的数字小数点后位很长问题 2020-04-16 17:54:07 +08:00
凌云
349219140f 修复兼容历史数据问题 2020-04-16 17:08:49 +08:00
凌云
998f203166 DB修改操作 2020-04-16 16:10:36 +08:00
凌云
47c6cca28a 1、优化用户交互
2、新增增量时间格式选择
3、分离不同环境配置
4、增加systemctl启动命令
2020-04-16 16:03:06 +08:00
weiye
cee57ea338 删除iml文件 2020-03-31 13:20:57 +08:00
WeiYe
4b654f3515
Merge pull request #73 from WeiYe-Jing/revert-72-feature#61
Revert "Feature#61"
2020-03-30 09:44:38 +08:00
WeiYe
d6e9b4a9ca
Revert "Feature#61" 2020-03-30 09:44:00 +08:00
WeiYe
ce9e62e12e
Merge pull request #72 from waterWang/feature#61
Feature#61
2020-03-30 09:38:04 +08:00
water
c56d76d16c test 2020-03-29 23:49:41 +08:00
WeiYe
7c2e4f48f7
Update README.md 2020-03-29 23:28:26 +08:00
WeiYe
8b15398f6c
Update LICENSE 2020-03-29 23:26:07 +08:00
walkerJing
1f4e8b8f5b 文档更新 2020-03-29 08:19:44 +08:00
walkerJing
97570e1823 文档更新 2020-03-28 23:29:31 +08:00
walkerJing
810d74f632 文档更新 2020-03-28 23:21:04 +08:00
walkerJing
4dc6b89186 文档更新 2020-03-28 23:15:17 +08:00
water
d9f0c7bb0e merge 2020-03-28 23:12:16 +08:00
water
1a2b2cd68a update:优化代码 2020-03-28 22:59:36 +08:00
walkerJing
bca5a4b31d 文档更新 2020-03-28 18:22:19 +08:00
walkerJing
bd700faa2a 文档更新 2020-03-28 18:01:13 +08:00
walkerJing
2dc5a51b71 更新 userGuid.md 2020-03-28 17:27:43 +08:00
walkerJing
85af2fcff1 文档中的图片迁移 2020-03-28 16:52:07 +08:00
walkerJing
01c6a14799 更新 userGuid.md 2020-03-28 15:54:01 +08:00
walkerJing
e39023bdf7 更新 userGuid.md 2020-03-28 15:32:06 +08:00
walkerJing
790418c22a add userGuid.md 2020-03-28 15:28:21 +08:00
walkerJing
95fe0856fe sql文档修改 2020-03-28 11:16:23 +08:00
water
a9292be2c4
Merge pull request #15 from WeiYe-Jing/dev
Dev
2020-03-27 18:00:05 +08:00
water
2ed42b7d93 fix:java.security.InvalidKeyException: Illegal key size 2020-03-27 17:56:08 +08:00
weiye
13e9d250e5 Merge branch 'v2.1.1' into dev 2020-03-27 13:20:10 +08:00
weiye
afb554b919 Merge branch 'v2.1.1' 2020-03-27 13:19:42 +08:00
weiye
61b9e18179 #69 修复 2020-03-27 13:15:36 +08:00
weiye
b56f4ac32b Merge branch 'v2.1.1' into dev 2020-03-26 20:25:17 +08:00
weiye
df9ec4dc63 Merge branch 'v2.1.1' 2020-03-26 20:24:47 +08:00
weiye
e031913131 mongodb,hbase连接创建优化 2020-03-26 20:24:23 +08:00
weiye
3a6a812c9b Merge remote-tracking branch 'origin/master' 2020-03-26 12:01:18 +08:00
weiye
4cb9e19190 #67 修复 2020-03-26 12:00:31 +08:00
water
1faa5cc2ae update:优化代码 2020-03-26 11:55:06 +08:00
water
60ced18885 update:优化代码 2020-03-26 11:50:41 +08:00
water
debd4c0425
Merge pull request #14 from WeiYe-Jing/dev
Dev
2020-03-26 10:15:36 +08:00
WeiYe
1ef9ed8889
Update README.md 2020-03-25 17:28:08 +08:00
WeiYe
6142fe45cb
Update README.md 2020-03-25 17:25:28 +08:00
weiye
3af40151a5 Merge branch 'v2.1.1' into dev 2020-03-25 15:26:50 +08:00
weiye
cf5a1de21c #66 2020-03-25 15:23:21 +08:00
weiye
1568976c89 #66 2020-03-25 15:21:16 +08:00
weiye
34044f52a4 用户权限代码恢复 2020-03-25 14:18:18 +08:00
weiye
e3b8ae8031 Merge branch 'master' into dev
# Conflicts:
#	doc/db/2.1.2预留.sql
#	doc/db/datax_web.sql
2020-03-25 14:08:14 +08:00
weiye
8a0277b1d8 #65 2020-03-25 13:42:45 +08:00
water
00f3b5d472
Merge pull request #64 from waterWang/feature#62
Feature#62
2020-03-25 12:40:32 +08:00
water
bac25aa1f3
Merge pull request #63 from waterWang/feature#62
Feature#62
2020-03-25 12:38:19 +08:00
water
289b566404 #62 2020-03-25 11:19:41 +08:00