Commit Graph

651 Commits

Author SHA1 Message Date
ligang 7dc7348c3c Merge remote-tracking branch 'remotes/upstream/branch-1.0.2' into branch-1.0.2 2019-05-21 15:05:12 +08:00
millionfor e171234f2a
Merge pull request #321 from millionfor/branch-1.0.2
Branch 1.0.2
2019-05-21 14:58:18 +08:00
gongzijian 0cfa35da4e fix 2019-05-21 14:57:29 +08:00
gongzijian 7b1f95d067 t 2019-05-21 14:56:02 +08:00
gongzijian d5cacb192e 修改文件显示问题 2019-05-21 14:55:21 +08:00
乔占卫 0cc61f5d8d
Merge pull request #316 from qiaozhanwei/branch-1.0.2
.escheduler_env.sh update
2019-05-20 15:17:14 +08:00
qiaozhanwei 1e742eed2c .escheduler_env.sh update 2019-05-20 15:16:15 +08:00
乔占卫 ecc899ed70
Merge pull request #315 from qiaozhanwei/branch-1.0.2
solve nginx 504 Gateway Time-out
2019-05-20 15:03:06 +08:00
qiaozhanwei e8c8487cb4 solve nginx 504 Gateway Time-out 2019-05-20 15:01:57 +08:00
bao liang a33fddc263
Merge pull request #314 from lenboo/branch-1.0.2
fix bugs:global parameters,unit calculate error,tolerance tasks...
2019-05-20 14:48:58 +08:00
baoliang faf993e6b7 delete unused code 2019-05-20 14:44:52 +08:00
ligang 55d5314428 Merge remote-tracking branch 'remotes/upstream/branch-1.0.2' into branch-1.0.2 2019-05-20 14:31:01 +08:00
gongzijian 7e6742182a test 2019-05-20 14:18:49 +08:00
lilin 28ba72b1eb 修改如果用户没有创建资源时给用户授权资源会报空指针 2019-05-20 14:10:22 +08:00
lilin f420d24187 提示信息不正确 2019-05-20 14:10:09 +08:00
baoliang 13e31da0c5 Merge remote-tracking branch 'upstream/branch-1.0.2' into 102 2019-05-20 14:07:55 +08:00
hymzcn 5956409a67
Merge pull request #311 from hymzcn/branch-1.0.2
env
2019-05-20 10:13:52 +08:00
huyuanming d1490155c2 env 2019-05-20 10:09:05 +08:00
乔占卫 3ef73aea6b
Merge pull request #304 from qiaozhanwei/branch-1.0.2
only one master restart need failure and tolerant task restart scheduler
2019-05-17 15:10:31 +08:00
qiaozhanwei 0d5b4abcbf only one master restart need failure and tolerant task restart scheduler 2019-05-17 15:09:27 +08:00
baoliang 0bf8e270a6 fix bug: tolerance task need not to check retry times 2019-05-17 11:14:19 +08:00
baoliang a40fcc0efa fix bug: unit calculate error 2019-05-16 19:30:17 +08:00
乔占卫 0ee5bfc49b
Merge pull request #302 from qiaozhanwei/branch-1.0.2
work tolerance update
2019-05-16 19:17:27 +08:00
qiaozhanwei ad18251c7a work tolerance update 2019-05-16 19:16:13 +08:00
millionfor 1e9299cdf2
Merge pull request #299 from millionfor/branch-1.0.2
修复变量问题
2019-05-15 17:40:39 +08:00
gongzijian bd38721801 修复变量问题 2019-05-15 17:39:02 +08:00
乔占卫 bcfc3d931c
Merge pull request #298 from qiaozhanwei/branch-1.0.2
Delete the process instance and delete the corresponding queue information
2019-05-15 17:02:05 +08:00
qiaozhanwei 702a64c43f Delete the process instance and delete the corresponding queue information,update 2019-05-15 17:00:58 +08:00
qiaozhanwei 493e4ac912 Delete the process instance and delete the corresponding queue information. 2019-05-15 16:05:10 +08:00
lgcareer c94ad601b9
Merge pull request #287 from lgcareer/branch-1.0.2
add determine if the login user is the owner of the process definition or schedule
2019-05-14 11:22:22 +08:00
ligang b5a2e3bbd2 add Determine if the login user is the owner of the schedule 2019-05-14 11:18:04 +08:00
ligang be230c611f add Determine if the login user is the owner of the process definition 2019-05-14 11:06:10 +08:00
lgcareer cca2877bf4
Merge pull request #285 from lgcareer/branch-1.0.2
Support for custom SQL job title
2019-05-13 20:29:37 +08:00
ligang f0758a3aea Merge remote-tracking branch 'remotes/upstream/branch-1.0.2' into branch-1.0.2 2019-05-13 20:24:44 +08:00
乔占卫 c96a56c1a1
Merge pull request #284 from qiaozhanwei/branch-1.0.2
columns alias update
2019-05-13 19:08:07 +08:00
qiaozhanwei 45aa9db588 columns alias update 2019-05-13 19:07:21 +08:00
乔占卫 92822216ef
Merge pull request #283 from qiaozhanwei/branch-1.0.2
columns alias update
2019-05-13 18:56:46 +08:00
qiaozhanwei 2a9f8d487e columns alias update 2019-05-13 18:54:39 +08:00
ligang 4381955962 add title in SqlParameters 2019-05-13 16:20:59 +08:00
lgcareer d973d50d3e
Merge pull request #282 from lgcareer/branch-1.0.2
support batch delete process definition and process instance
2019-05-13 15:28:16 +08:00
ligang b7f3dad506 add function batchDeleteProcessDefinitionByIds 2019-05-13 15:24:25 +08:00
ligang b8e7c1e039 Merge remote-tracking branch 'remotes/upstream/branch-1.0.2' into branch-1.0.2 2019-05-13 15:22:07 +08:00
乔占卫 500509e29e
Merge pull request #281 from qiaozhanwei/branch-1.0.2
Scheduled scheduling, use scheduler-time
2019-05-13 14:55:34 +08:00
qiaozhanwei 34800ada6c Scheduled scheduling, use scheduler-time 2019-05-13 14:54:40 +08:00
乔占卫 c2e760bfaa
Merge pull request #280 from qiaozhanwei/branch-1.0.2
If there is a scheduled time, take the scheduling time. Recovery from…
2019-05-13 14:11:02 +08:00
qiaozhanwei 5fced1497b If there is a scheduled time, take the scheduling time. Recovery from failed nodes, suspension of recovery, re-run for scheduling 2019-05-13 14:09:26 +08:00
ligang 9a89d59485 add batchDeleteProcessInstanceByIds 2019-05-13 14:03:57 +08:00
lgcareer 98450c7bfd
Merge pull request #278 from lgcareer/branch-1.0.2
add listFileStatus and update deleteTenantById
2019-05-10 20:43:42 +08:00
ligang 58f142bc68 Merge remote-tracking branch 'remotes/upstream/branch-1.0.2' into branch-1.0.2 2019-05-10 20:39:30 +08:00
ligang e577776c03 add queryByProcessDefinitionId 2019-05-10 19:34:53 +08:00