550 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ligang	8fc165e62f	Merge remote-tracking branch 'remotes/upstream/dev-20190415' into dev-20190415	2019-04-25 16:21:11 +08:00
乔占卫	17ad2d65d2	Merge pull request #151 from qiaozhanwei/dev-20190415 ... queue count update	2019-04-25 16:20:15 +08:00
qiaozhanwei	2dd2e64fb2	queue count update	2019-04-25 16:15:58 +08:00
millionfor	954371c289	Merge pull request #150 from millionfor/dev-20190415 ... Dev 20190415	2019-04-25 15:52:38 +08:00
gongzijian	187a794c9c	Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415	2019-04-25 15:52:00 +08:00
gongzijian	1b5bec660b	超时告警	2019-04-25 15:51:49 +08:00
easyscheduler	1b9a5615ca	Merge pull request #149 from lidongdai/dev-20190415 ... when debug,show jdbc parameter log	2019-04-25 15:51:48 +08:00
dailidong	4933bea338	when debug,show jdbc parameter log	2019-04-25 15:30:13 +08:00
millionfor	7a3caa2060	Merge pull request #148 from millionfor/dev-20190415 ... Dev 20190415	2019-04-25 15:10:42 +08:00
gongzijian	09bd894bd2	Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415	2019-04-25 15:10:04 +08:00
gongzijian	5c5ec2f876	首页 隐藏时间	2019-04-25 15:09:54 +08:00
millionfor	9ba0109ddb	Merge pull request #147 from millionfor/dev-20190415 ... Dev 20190415	2019-04-25 15:07:29 +08:00
gongzijian	7c0b234bb5	Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415	2019-04-25 15:06:48 +08:00
gongzijian	0ef3649ee2	首页改造结构 抽分组件	2019-04-25 15:06:25 +08:00
baoliang	a32b48aa74	update dao resource	2019-04-25 14:09:46 +08:00
baoliang	47abbdb41f	Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415	2019-04-25 14:08:51 +08:00
乔占卫	c71e1521fb	Merge pull request #145 from qiaozhanwei/dev-20190415 ... task queue count update	2019-04-25 13:43:40 +08:00
qiaozhanwei	b215856137	task queue count update	2019-04-25 13:40:10 +08:00
ligang	283e7bd2ed	add upgrade	2019-04-25 10:49:01 +08:00
millionfor	ec224e2709	Merge pull request #144 from millionfor/dev-20190415 ... Dev 20190415	2019-04-25 10:23:47 +08:00
gongzijian	b7fd46f3e4	Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415	2019-04-25 10:23:15 +08:00
gongzijian	1708b74f1b	完成监控中心	2019-04-25 10:22:58 +08:00
easyscheduler	46dda9589d	Merge pull request #133 from lidongdai/dev-20190415 ... add monitor	2019-04-24 18:23:51 +08:00
dailidong	4b930ade92	add monitor by lidong	2019-04-24 18:22:06 +08:00
lgcareer	4720cd4852	Merge pull request #132 from lgcareer/dev-20190415 ... Dev 20190415:add receivers and receiversCc in SqlParameter and SqlTask	2019-04-24 18:13:29 +08:00
ligang	320f2faf6f	remove readme.txt	2019-04-24 18:07:07 +08:00
ligang	89d76525c7	Merge remote-tracking branch 'remotes/upstream/dev-20190415' into dev-20190415	2019-04-24 18:03:45 +08:00
easyscheduler	d8094671d6	Merge pull request #131 from lidongdai/dev-20190415 ... add monitor by lidong	2019-04-24 18:02:57 +08:00
dailidong	d2fe0b10f1	add monitor by lidong	2019-04-24 17:59:27 +08:00
ligang	f551487b68	update escheduler_ddl in 1.0.2	2019-04-24 17:57:33 +08:00
ligang	a233ddd362	Merge remote-tracking branch 'remotes/upstream/dev-20190415' into dev-20190415	2019-04-24 17:55:11 +08:00
baoliang	20cb51c5a1	Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415	2019-04-24 17:29:22 +08:00
easyscheduler	ab74e32a0d	Merge pull request #128 from lidongdai/dev-20190415 ... add monitor	2019-04-24 17:07:53 +08:00
dailidong	1e43309661	Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 ... # Conflicts: # escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java	2019-04-24 17:04:21 +08:00
dailidong	a3d9d56fec	add monitor	2019-04-24 16:57:11 +08:00
dailidong	5199e4b8fb	add monitor	2019-04-24 16:48:52 +08:00
ligang	de07aabb99	Merge remote-tracking branch 'remotes/upstream/dev-20190415' into dev-20190415	2019-04-24 16:04:09 +08:00
millionfor	c578e2d2f3	Merge pull request #127 from millionfor/dev-20190415 ... Dev 20190415	2019-04-24 16:01:07 +08:00
gongzijian	5e107a8ca4	Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415	2019-04-24 16:00:21 +08:00
gongzijian	ceb45d9ce4	解决验证租户编码问题 解决用户验证手机号问题 解决sql获取收件人抄送人email	2019-04-24 16:00:05 +08:00
乔占卫	40216b3446	Merge pull request #126 from qiaozhanwei/dev-20190415 ... api token update and add tenant code check	2019-04-24 15:48:26 +08:00
qiaozhanwei	3a0ca2a934	add tenant code check	2019-04-24 15:47:23 +08:00
ligang	69dbbce867	update getReceiverCc add processInstanceId	2019-04-24 15:46:10 +08:00
ligang	d86a4bed53	Merge remote-tracking branch 'remotes/upstream/dev-20190415' into dev-20190415	2019-04-24 15:44:18 +08:00
baoliang	bd144ae7bb	Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415	2019-04-24 15:01:19 +08:00
easyscheduler	9247e977e1	Merge pull request #115 from samz406/master ... 更新项目名时没有做名称唯一性校验	2019-04-24 14:38:00 +08:00
qiaozhanwei	fd3d109b67	Merge remote-tracking branch 'remotes/upstream/dev-20190415' into dev-20190415	2019-04-24 11:53:20 +08:00
millionfor	d750de3fe8	Merge pull request #122 from millionfor/dev-20190415 ... Dev 20190415	2019-04-24 11:39:31 +08:00
gongzijian	9349ad6ee6	Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415	2019-04-24 11:36:59 +08:00
gongzijian	b13aabe5b5	首页增加队列统计命令状态统计	2019-04-24 11:36:15 +08:00