575 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
qiaozhanwei	07c5df928e	api access token update	2019-04-24 11:25:44 +08:00
qiaozhanwei	2a2a8a778b	api token update	2019-04-24 11:23:03 +08:00
ligang	8a1db01ace	Merge remote-tracking branch 'remotes/upstream/dev-20190415' into dev-20190415	2019-04-24 11:22:51 +08:00
ligang	b0a9033128	update receivers and receiversCc	2019-04-24 11:22:15 +08:00
bao liang	4a6912e4c6	Merge pull request #120 from lenboo/dev-20190415 ... tasks run on the specified worker	2019-04-24 10:45:26 +08:00
baoliang	17671f615b	update worker group	2019-04-24 10:42:46 +08:00
baoliang	9b710f39ad	Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415	2019-04-23 18:33:26 +08:00
乔占卫	0c42d07604	Merge pull request #118 from qiaozhanwei/dev-20190415 ... command count update	2019-04-23 18:27:02 +08:00
qiaozhanwei	1fd142c3f6	command count update	2019-04-23 18:26:29 +08:00
乔占卫	c29e2f1aa2	Merge pull request #117 from qiaozhanwei/dev-20190415 ... command count update	2019-04-23 18:24:46 +08:00
qiaozhanwei	7c3f5b61d3	command count update	2019-04-23 18:23:56 +08:00
samz406	e8c198cb20	更新项目名时没有做名称唯一性校验 ... 1更新项目名时没有做名称唯一性校验 2 建议将项目表名称设置为唯一索引	2019-04-23 17:26:45 +08:00
ligang	93d70ff5a5	Merge remote-tracking branch 'remotes/upstream/dev-20190415' into dev-20190415	2019-04-23 17:25:21 +08:00
millionfor	f0b4ee97d7	Merge pull request #114 from millionfor/dev-20190415 ... Dev 20190415	2019-04-23 17:13:39 +08:00
gongzijian	ddc66e900f	Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415	2019-04-23 17:13:01 +08:00
gongzijian	632e6169d9	sql 节点增加收件人和抄送人	2019-04-23 17:12:50 +08:00
easyscheduler	49fdee0cc6	Merge pull request #110 from samz406/master ... TENANT_NAME_EXIST 这里实际验证的是租户编码，不是租户名称是否唯一。	2019-04-23 16:46:08 +08:00
samz406	1908e6d174	更新用户时填写已经存的用户名报错 ... 更新用户名如果填写已经存在的用户名会报错。	2019-04-23 16:33:39 +08:00
samz406	dd35addfb6	更新用户时填写已经存的用户名报错 ... 更新用户名如果填写已经存在的用户名会报错。	2019-04-23 16:27:51 +08:00
samz406	ce7ececda6	更新用户时填写已经存的用户名报错 ... 更新用户名如果填写已经存在的用户名会报错。	2019-04-23 16:25:18 +08:00
ligang	586755d821	add receivers and receiversCc in SqlParameter and SqlTask	2019-04-23 16:20:37 +08:00
baoliang	c2f8e8ef3b	update worker group	2019-04-23 16:07:36 +08:00
baoliang	5cb00e253e	update worker group	2019-04-23 15:43:28 +08:00
ligang	821f072463	add receivers and receiversCc in SqlParameter and SqlTask	2019-04-23 15:37:46 +08:00
baoliang	90de48bbe5	update worker group	2019-04-23 15:33:30 +08:00
baoliang	ac3cedc277	update worker group	2019-04-23 15:26:50 +08:00
samz406	a3a41ac8ee	TENANT_NAME_EXIST 这里实际验证的是租户编码，不是租户名称是否唯一。 ... TENANT_NAME_EXIST 这里实际验证的是租户编码，不是租户名称是否唯一。	2019-04-23 15:21:39 +08:00
baoliang	69bb7c749e	update worker group	2019-04-23 14:56:11 +08:00
qiaozhanwei	bbd2f2bd08	queue count update	2019-04-23 14:54:26 +08:00
baoliang	1ce97039bc	add worker group id in task instance	2019-04-23 14:20:21 +08:00
ligang	5d90156b86	Merge remote-tracking branch 'remotes/upstream/dev-20190415' into dev-20190415	2019-04-23 14:01:45 +08:00