dailidong
|
1e43309661
|
Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415
# Conflicts:
# escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java
|
6 years ago |
|
dailidong
|
a3d9d56fec
|
add monitor
|
6 years ago |
|
dailidong
|
5199e4b8fb
|
add monitor
|
6 years ago |
millionfor
|
c578e2d2f3
|
Merge pull request #127 from millionfor/dev-20190415
Dev 20190415
|
6 years ago |
gongzijian
|
5e107a8ca4
|
Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415
|
6 years ago |
|
gongzijian
|
ceb45d9ce4
|
解决验证租户编码问题 解决用户验证手机号问题 解决sql获取收件人抄送人email
|
6 years ago |
乔占卫
|
40216b3446
|
Merge pull request #126 from qiaozhanwei/dev-20190415
api token update and add tenant code check
|
6 years ago |
qiaozhanwei
|
3a0ca2a934
|
add tenant code check
|
6 years ago |
|
qiaozhanwei
|
fd3d109b67
|
Merge remote-tracking branch 'remotes/upstream/dev-20190415' into dev-20190415
|
6 years ago |
|
millionfor
|
d750de3fe8
|
Merge pull request #122 from millionfor/dev-20190415
Dev 20190415
|
6 years ago |
|
gongzijian
|
9349ad6ee6
|
Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415
|
6 years ago |
|
gongzijian
|
b13aabe5b5
|
首页增加队列统计命令状态统计
|
6 years ago |
|
qiaozhanwei
|
07c5df928e
|
api access token update
|
6 years ago |
|
qiaozhanwei
|
2a2a8a778b
|
api token update
|
6 years ago |
bao liang
|
4a6912e4c6
|
Merge pull request #120 from lenboo/dev-20190415
tasks run on the specified worker
|
6 years ago |
baoliang
|
17671f615b
|
update worker group
|
6 years ago |
|
baoliang
|
9b710f39ad
|
Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415
|
6 years ago |
|
乔占卫
|
0c42d07604
|
Merge pull request #118 from qiaozhanwei/dev-20190415
command count update
|
6 years ago |
|
qiaozhanwei
|
1fd142c3f6
|
command count update
|
6 years ago |
|
乔占卫
|
c29e2f1aa2
|
Merge pull request #117 from qiaozhanwei/dev-20190415
command count update
|
6 years ago |
|
qiaozhanwei
|
7c3f5b61d3
|
command count update
|
6 years ago |
|
millionfor
|
f0b4ee97d7
|
Merge pull request #114 from millionfor/dev-20190415
Dev 20190415
|
6 years ago |
|
gongzijian
|
ddc66e900f
|
Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415
|
6 years ago |
|
gongzijian
|
632e6169d9
|
sql 节点增加收件人和抄送人
|
6 years ago |
|
baoliang
|
c2f8e8ef3b
|
update worker group
|
6 years ago |
|
baoliang
|
5cb00e253e
|
update worker group
|
6 years ago |
|
baoliang
|
90de48bbe5
|
update worker group
|
6 years ago |
|
baoliang
|
ac3cedc277
|
update worker group
|
6 years ago |
|
baoliang
|
69bb7c749e
|
update worker group
|
6 years ago |
|
qiaozhanwei
|
bbd2f2bd08
|
queue count update
|
6 years ago |
|
baoliang
|
1ce97039bc
|
add worker group id in task instance
|
6 years ago |
|
millionfor
|
a045a5a2a7
|
Merge pull request #108 from millionfor/dev-20190415
Dev 20190415
|
6 years ago |
|
gongzijian
|
9f8888f759
|
Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415
|
6 years ago |
|
gongzijian
|
a473034242
|
监控中心
|
6 years ago |
|
gongzijian
|
ddea262a80
|
token权限改为普通和admin都具备增删改权限
|
6 years ago |
|
baoliang
|
12caae7241
|
Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415
|
6 years ago |
|
millionfor
|
871bdd78ed
|
Merge pull request #102 from millionfor/dev-20190415
Dev 20190415
|
6 years ago |
|
gongzijian
|
137bef50d6
|
Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415
|
6 years ago |
|
gongzijian
|
a5c5f8a33f
|
worker分组
|
6 years ago |
|
baoliang
|
e02bbc1215
|
add worker group id in scheduler;
change workerGroupId default value to -1.
|
6 years ago |
|
baoliang
|
2e745568a5
|
add worker group id in command/process instance/error command
|
6 years ago |
|
baoliang
|
79e11a8767
|
update worker group
|
6 years ago |
|
baoliang
|
b3c2ea31d8
|
update worker group
|
6 years ago |
|
baoliang
|
71951ecd96
|
update worker group
|
6 years ago |
|
baoliang
|
a8c41bbc68
|
Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415
|
6 years ago |
|
millionfor
|
28c370e349
|
Merge pull request #99 from millionfor/dev-20190415
增加worker
|
6 years ago |
|
gongzijian
|
ef76a8686a
|
增加worker
|
6 years ago |
|
baoliang
|
b304a9bf39
|
update worker group
|
6 years ago |
|
baoliang
|
a47f03c657
|
update worker group
|
6 years ago |
|
baoliang
|
dd874b8a3d
|
update worker group
|
6 years ago |
