Commit Graph

5584 Commits

Author SHA1 Message Date
gongzijian
3a72418570 build escheduler-ui => dist 2019-04-12 14:39:59 +08:00
bao liang
00d63c40e9
Merge pull request #43 from lenboo/dev
fix bug the running time is negative when repeat running
2019-04-12 11:57:57 +08:00
baoliang
df1ba0b85d Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
#	docs/zh_CN/前端部署文档.md
2019-04-12 11:55:16 +08:00
乔占卫
c999410e64
Merge pull request #42 from qiaozhanwei/dev
worker fetch task num update
2019-04-12 11:47:10 +08:00
Baoqi
c6a2295068 update clickchouse unit test 2019-04-12 11:43:56 +08:00
qiaozhanwei
89879f2d11 worker fetch task num update 2019-04-12 11:42:15 +08:00
millionfor
2460b0a2f2
Merge pull request #41 from millionfor/dev
Dev
2019-04-12 11:33:44 +08:00
gongzijian
f1a6630f74 Merge remote-tracking branch 'upstream/dev' into dev 2019-04-12 11:32:54 +08:00
gongzijian
5070f86bc2 update .gitignore 2019-04-12 11:32:35 +08:00
ligang
15ebd9d41f update verifyQueue 2019-04-12 11:32:22 +08:00
ligang
81c39f1053 Merge remote-tracking branch 'upstream/dev' into dev 2019-04-12 11:25:51 +08:00
ligang
68d0c974a7 update stauts and QueueService 2019-04-12 11:22:04 +08:00
millionfor
8aeb1b466b
Merge pull request #40 from millionfor/dev
Dev
2019-04-12 11:18:28 +08:00
gongzijian
c5a170c18d Merge remote-tracking branch 'upstream/dev' into dev 2019-04-12 11:17:54 +08:00
gongzijian
57227cd602 update doc 2019-04-12 11:17:42 +08:00
millionfor
506cd54cab
Merge pull request #39 from millionfor/dev
Dev
2019-04-12 11:10:45 +08:00
gongzijian
2dff02b86a update queue 2019-04-12 11:09:20 +08:00
gongzijian
2f8acc5b7e Merge remote-tracking branch 'upstream/dev' into dev 2019-04-12 11:01:32 +08:00
gongzijian
636205d6ad update queue 2019-04-12 11:01:02 +08:00
bao liang
d79efa2a15
Merge pull request #38 from lenboo/dev
update install document
2019-04-12 10:55:35 +08:00
baoliang
7c2f6a9a1e Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
#	docs/zh_CN/前端部署文档.md
2019-04-12 10:52:57 +08:00
ligang
11117f2749 Merge remote-tracking branch 'upstream/dev' into dev 2019-04-12 10:30:15 +08:00
qiaozhanwei
62cb755622 Merge remote-tracking branch 'upstream/dev' into dev
20190412
2019-04-12 10:27:44 +08:00
baoliang
6c44ac3afa update install document 2019-04-12 10:13:04 +08:00
baoliang
2f9505474b update install document 2019-04-12 10:07:27 +08:00
millionfor
2977e6ae5e
Merge pull request #37 from millionfor/dev
Dev
2019-04-12 09:33:15 +08:00
gongzijian
bcd1d584fa Merge remote-tracking branch 'upstream/dev' into dev 2019-04-12 09:31:53 +08:00
gongzijian
d83beaf35b update queue/doc/menu 2019-04-12 09:30:40 +08:00
ligang
8394c9bfe5 update countQueuePaging and queryQueuePaging 2019-04-11 20:17:10 +08:00
ligang
5d41d66427 update QueueController and QueueService 2019-04-11 20:06:39 +08:00
ligang
022b49b45d update QUEUE_EXIST and QUEUE_NAME_EXIST 2019-04-11 20:06:03 +08:00
Baoqi
6a233d670d Fix:checkConnection should close connection to avoid connection leak 2019-04-11 20:01:35 +08:00
Baoqi
034cc20da9 add ClickHouse jdbc support 2019-04-11 19:57:05 +08:00
ligang
0b85a92e2c add NEED_NOT_UPDATE_QUEUE and VERIFY_QUEUE_ERROR 2019-04-11 18:42:13 +08:00
ligang
4214d60ffa add queryByQueueName 2019-04-11 18:39:54 +08:00
ligang
30a63a05aa add verify queue_name 2019-04-11 18:06:49 +08:00
baoliang
0796350648 Merge remote-tracking branch 'upstream/dev' into dev 2019-04-11 18:04:08 +08:00
乔占卫
e42d2aa558
Merge pull request #35 from Baoqi/dev_dont_send_email_when_no_recipts
before send mail, check whether no receivers && cc receivers
2019-04-11 17:22:15 +08:00
ligang
a11418a588 update QueueService 2019-04-11 17:21:18 +08:00
乔占卫
4fbd9380de
Update MailUtils.java
if there is no receivers && no receiversCc, no need to process
2019-04-11 17:19:42 +08:00
escheduler
30b8d0836b
Merge pull request #32 from analysys/dev
Dev
2019-04-11 17:07:10 +08:00
ligang
a91c6b16aa update returnDataListPaging 2019-04-11 17:02:28 +08:00
Baoqi
2714cb1e6d before send mail, check whether no receivers && cc receivers.
to avoid exception javax.mail.SendFailedException: No recipient
addresses. Especially from SQL Task
2019-04-11 16:55:34 +08:00
ligang
6548195a0c update QueueController and QueueService 2019-04-11 16:33:05 +08:00
ligang
303e1b751a update QueueMapper and QueueMapperProvider 2019-04-11 16:30:58 +08:00
ligang
ffbb771cbf add CREATE_QUEUE_ERROR、QUEUE_NOT_EXIST、QUEUE_EXIST、UPDATE_QUEUE_ERROR 2019-04-11 16:27:26 +08:00
ligang
f5662e2d1c add createTime and updateTime 2019-04-11 16:24:38 +08:00
baoliang
f6ac53b85d update install document 2019-04-11 15:45:50 +08:00
baoliang
2d49c5098a fix bug, update action would change the user of definition. 2019-04-11 15:24:50 +08:00
baoliang
5037bb631c update install document 2019-04-11 15:04:44 +08:00