Tree: e608f4ad42

2.0.7-release

2.0.8-release

2.0.9-release

3.0.0-release

3.0.0/version-upgrade

3.0.1-release

3.0.2-release

3.0.3-release

3.0.4-release

3.0.5-release

3.0.6-release

3.1.0-release

3.1.1-release

3.1.2-release

3.1.3-release

3.1.4-release

3.1.5-release

3.1.6-release

3.1.7-release

3.1.8-release

3.1.9-release

3.2.0-release

3.2.1-prepare

3.2.1-release

3.2.2-prepare

3.2.2-release

3.2.2-release-bak

dev

dev_wenjun_refactorMaster

upstream-dev

1.0.0

1.0.1

1.0.2

1.0.3

1.0.4

1.0.5

1.1.0

1.1.0-preview

1.2.0

1.2.1

1.3.0

1.3.1

1.3.2

1.3.3

1.3.4

1.3.5

1.3.6

1.3.8

1.3.9

2.0.0

2.0.0-alpha

2.0.1

2.0.2

2.0.3

2.0.4

2.0.5

2.0.6

2.0.7

2.0.8

2.0.9

3.0.0

3.0.0-alpha

3.0.0-beta-1

3.0.0-beta-2

3.0.1

3.0.2

3.0.3

3.0.4

3.0.5

3.0.6

3.1.0

3.1.1

3.1.2

3.1.3

3.1.4

3.1.5

3.1.6

3.1.7

3.1.8

3.1.9

3.2.0

3.2.1

3.2.2

test

v2.3.3

v2.3.4.202211081355

v2.3.4.202211091515

vdev-20220412-1028

vdev-20220414-1341

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'e608f4ad42'

${ noResults }

Commit Graph

729 Commits (e608f4ad42915e14b822ec4539889c00a4c0ed5f)

Author	SHA1	Message	Date
break60	0e6494567f	fix	5 years ago
qiaozhanwei	2330cc8872	master select worker filter high load worker #2704 (#2733) ... * add LoggerServerTest UT * add LoggerServerTest UT * add LoggerServerTest UT add RemoveTaskLogRequestCommandTest UT add RemoveTaskLogResponseCommandTest * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>	5 years ago
dailidong	8cb4cd23ca	fix getWorkers bug on RunConfig (#2747) ... * fix worker group config no effect * remove codehaus janino jar the license about janino maybe not compatiable with Apache v2 * Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0 # Conflicts: # dolphinscheduler-server/src/main/resources/config/install_config.conf * datasource config * Update datasource.properties * fix RunConfig bug	5 years ago
bao liang	a9da86abb4	[bug fix] fix bug:2634:Process shows success,when the task of the process is killed in the terminal (#2731) ... * fix bug: some bugs about worker group from 1.2.0 to 1.3.0 * fix bug: scheduler from 1.2.0 to 1.3.0 do not work * fix bug: scheduler from 1.2.0 to 1.3.0 do not work * fix ut bug * fix bug: Process shows success,when the task of the process is killed in the termina * fix bug #2634: Process shows success,when the task of the process is killed in the terminal Co-authored-by: baoliang <baoliang@analysys.com.cn>	5 years ago
dailidong	63ce143be5	set worker group (#2743) ... * simple config * fix worker group config no effect	5 years ago
xingchun-chen	7010bb2ef2	Modify HDFS/S3 path (#2736) ... * Modify HDFS/S3 path   * Modify HDFS/S3 path   * Update common.properties Co-authored-by: chenxingchun <438044805@qq.com> Co-authored-by: dailidong <dailidong66@gmail.com>	5 years ago
gabry	1864f87c84	remove unnecessary lock & fix syncWorkerHostWeight variable reference bug	5 years ago
dailidong	f26d2a7c20	fix worker group config no effect (#2719)	5 years ago
gabry.wu	c28a697ee8	add RetryerUtils to retry async & sync function gracefully (#2697) ... * add RetryerUtils tool class for async & sync retry invoking * add RetryerUtils tool class for async & sync retry invoking * add guava-retrying-2.0.0.jar to known-dependencies.txt * fix javadoc * fix code smell Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>	5 years ago
qiaozhanwei	f4583d78e9	add UT (#2717) ... * add LoggerServerTest UT * add LoggerServerTest UT * add LoggerServerTest UT add RemoveTaskLogRequestCommandTest UT add RemoveTaskLogResponseCommandTest Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>	5 years ago
qiaozhanwei	689c216050	add LoggerServerTest UT (#2713) ... * add LoggerServerTest UT * add LoggerServerTest UT Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>	5 years ago
dailidong	ae14c1b3f6	add worker group config	5 years ago
qiaozhanwei	443a6d1935	delete log files while deleting process instances #2463 (#2693) ... * script variable has "processDefinitionId" is error #2664 * blank in eamil and left font align #2648 * delete log files while deleting process instances #2463 * delete log files while deleting process instances #2463 * delete log files while deleting process instances #2463 * delete log files while deleting process instances #2463 Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>	5 years ago
dailidong	06c4ddf8e3	add worker group config (#2681) ... * update README about DolphinScheduler * Update issue templates * update * regularize api pom xml update rpc maven compile to 1.8 * regularize api pom xml * change commons.lang3.StringUtils to common.utils.StringUtils * update pom.xml * update * correct equals method * jasper-runtime is needed when api server start * jasper-runtime jar is needed when api server start * combine logback config of master/worker/alert/api server to one logback.xml * remove tomcat runtime jar * add UT * add license * remove jasper-runtime jar, not need anymore * sovle jar conflict， remove servlet-api 2.5 jar * remove servlet 2.5 * add embedded database h2 and update embedded zookeeper * delete logs * add license * change log level to INFO * simplify and optimize config * add development state * simplify common config * add worker group config * add worker group config Co-authored-by: lidongdai <escheduler@outlook.com> Co-authored-by: dailidong <dolphinschedule@gmail.com>	5 years ago
bao liang	d99471806e	[bug fix] some bugs from 1.2.0 to 1.3.0 (#2676) ... * fix bug: some bugs about worker group from 1.2.0 to 1.3.0 * fix bug: scheduler from 1.2.0 to 1.3.0 do not work * fix bug: scheduler from 1.2.0 to 1.3.0 do not work * fix ut bug Co-authored-by: baoliang <baoliang@analysys.com.cn>	5 years ago
s751167520	cb5285384e	Fix some code specification issues (#2482) ... * Fix some code specification issues * Pre-compile regular expressions to improve efficiency and solve concurrency problems * Solve the nullpoint problem that Object.equals may bring * Modify if else structure, add {} to improve code readability Co-Authored-By: daili <daili@users.noreply.github.com> * Update ResourceTreeVisitor.java re-run test process Co-authored-by: daili <daili@users.noreply.github.com> Co-authored-by: dailidong <dailidong66@gmail.com>	5 years ago
dailidong	edab6597f6	add worker group config	5 years ago
qiaozhanwei	bb52671fee	Worker Group display #2627 (#2630) ... * dispatch task fail will set task status failed * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * send mail error, #2466 bug fix * send mail error, #2466 bug fix * send mail error, #2466 bug fix * send mail error, #2466 bug fix * #2486 bug fix * host and workergroup compatible * EnterpriseWeChatUtils modify * EnterpriseWeChatUtils modify * EnterpriseWeChatUtils modify * #2499 bug fix * add comment * revert comment * revert comment * #2499 buf fix * #2499 bug fix * #2499 bug fix * #2499 bug fix * #2499 bug fix * #2499 bug fix * #2499 bug fix * no valid worker group，master can kill task directly * no valid worker group，master can kill task directly * no valid worker group，master can kill task directly * no valid worker group，master can kill task directly * no valid worker group，master can kill task directly * no valid worker group，master can kill task directly * no valid worker group，master can kill task directly * no valid worker group，master can kill task directly * no valid worker group，master can kill task directly * No master don't create command #2571 * No master don't create command #2571 * No master don't create command #2571 * Worker Group display #2627 * Worker Group display #2627 * Worker Group display #2627 * Worker Group display #2627 * Worker Group display #2627 * Worker Group display #2627 Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>	5 years ago
ywywn	8c8e128d18	fix code annotation error(#2603) (#2614)	5 years ago
743294668	30d57f304a	Fix notes (#2615) ... Co-authored-by: taoyuxin <taoyuxin@inspur.com> Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> Co-authored-by: Tboy <guo.jiwei@immomo.com>	5 years ago
hgaol	85f3ac10a0	feat: add plugin management for alert service	5 years ago
张世鸣	798b133ec1	fix #2481	5 years ago
qiaozhanwei	a12103b08c	no valid worker group，master can kill task directly (#2541) ... * dispatch task fail will set task status failed * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * send mail error, #2466 bug fix * send mail error, #2466 bug fix * send mail error, #2466 bug fix * send mail error, #2466 bug fix * #2486 bug fix * host and workergroup compatible * EnterpriseWeChatUtils modify * EnterpriseWeChatUtils modify * EnterpriseWeChatUtils modify * #2499 bug fix * add comment * revert comment * revert comment * #2499 buf fix * #2499 bug fix * #2499 bug fix * #2499 bug fix * #2499 bug fix * #2499 bug fix * #2499 bug fix * no valid worker group，master can kill task directly * no valid worker group，master can kill task directly * no valid worker group，master can kill task directly * no valid worker group，master can kill task directly * no valid worker group，master can kill task directly * no valid worker group，master can kill task directly * no valid worker group，master can kill task directly * no valid worker group，master can kill task directly * no valid worker group，master can kill task directly Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>	5 years ago
xingchun-chen	7a100086b7	Increase dataX environment variable, sslTrust default value (#2555) ... * add LoginTest license * Delete useless packages * e2e add project and workflow case * e2e add project and workflow case * e2e add project and workflow case * e2e add project and workflow case * e2e add project and workflow case * e2e add project and workflow case * e2e add project and workflow case * e2e add project and workflow case * e2e add project and workflow case * e2e add project and workflow case * e2e add project and workflow case * e2e add project and workflow case * Update worker_group_id to worker_group in init.sql * Update worker_group_id to worker_group in init.sql * Update worker_group_id to worker_group * Increase dataX environment variable, sslTrust default value Co-authored-by: chenxingchun <438044805@qq.com>	5 years ago
t1mon	c50ad1240c	Add query result set limit. (#2459) ... * Optimize PropertyUtils instantiation. * Fix info error. * Add query result set limit. * fix code smell Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>	5 years ago
qiaozhanwei	db7c0cbd8c	#2499 buf fix (#2518) ... * dispatch task fail will set task status failed * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * send mail error, #2466 bug fix * send mail error, #2466 bug fix * send mail error, #2466 bug fix * send mail error, #2466 bug fix * #2486 bug fix * host and workergroup compatible * EnterpriseWeChatUtils modify * EnterpriseWeChatUtils modify * EnterpriseWeChatUtils modify * #2499 bug fix * add comment * revert comment * revert comment * #2499 buf fix Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>	5 years ago
lgcareer	733e8bcb0d	support download the resources existed in process definition which was old version (#2506) ... * fix #2442 and remove unavailable code * revert verifyResourceName method * Add ServiceException * add ServiceExceptionTest * update ServiceExceptionTest * add ServiceExceptionTest in pom * support download the resources existed in process definition which was old version	5 years ago
zixi0825	64d335d9f2	copy process feature #2412 (#2471) ... * Update pom.xml (#2467) * add copy process * add copy process 2 * add copy process 3 * add copy process 4 * add copy process 5 Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: sunchaohe <sunzhaohe@linklogis.com>	5 years ago
qiaozhanwei	f2bfdc14f7	#2499 bug fix (#2505) ... * dispatch task fail will set task status failed * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * send mail error, #2466 bug fix * send mail error, #2466 bug fix * send mail error, #2466 bug fix * send mail error, #2466 bug fix * #2486 bug fix * host and workergroup compatible * EnterpriseWeChatUtils modify * EnterpriseWeChatUtils modify * EnterpriseWeChatUtils modify * #2499 bug fix Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>	5 years ago
qiaozhanwei	54fc32e207	#2486 bug fix (#2487) ... * dispatch task fail will set task status failed * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * send mail error, #2466 bug fix * send mail error, #2466 bug fix * send mail error, #2466 bug fix * send mail error, #2466 bug fix * #2486 bug fix Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>	5 years ago
dailidong	eec92ed1fc	simplify and optimize config (#2469) ... * [Refactor worker] simplify and optimize config (#2386) * simplify config * simplify config * simplify and optimize config * Update HadoopUtils.java optimize HadoopUtils * Update HadoopUtilsTest.java * Update HadoopUtilsTest.java * Update HadoopUtilsTest.java * Update HttpUtils.java * Update pom.xml * Update HadoopUtilsTest.java * Update HadoopUtilsTest.java * Update HadoopUtilsTest.java * Update HadoopUtilsTest.java * Update HadoopUtilsTest.java * Update HadoopUtilsTest.java	5 years ago
bao liang	4946e88872	move dependent and conditions to master server (#2423) ... * move condition and dependent to master * move conditions to master * move conditions and dependent task to master * move conditions to master * update test * add log * add test for dependent task * add test for dependent task * update * update * refactor complexity code * refactor complexity code * add conditions task test * add conditions task test * update * update host to host:port * update logback.xml Co-authored-by: baoliang <baoliang@analysys.com.cn>	5 years ago
songgg	f929c6f3b7	[optimization]：prevent repeated database updates (#2396) ... * sqlTask failed to run * prevent repeated database updates * prevent repeated database updates * prevent repeated database updates Co-authored-by: songqh <songquanhe@foxmail.com> Co-authored-by: dailidong <dailidong66@gmail.com>	5 years ago
qiaozhanwei	d6798c6db7	1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix (#2430) ... * dispatch task fail will set task status failed * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix * 1，task status statistics and process status statistics bug fix (#2357) 2，worker group bug fix Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>	5 years ago
zixi0825	f21837076e	Solve the failure to execute non-query sql (#2413) ... Co-authored-by: sunchaohe <sunzhaohe@linklogis.com> Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> Co-authored-by: lgcareer <18610854716@163.com>	5 years ago
qiaozhanwei	96835ebda2	1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result (#2420) ... * dispatch task fail will set task status failed * 1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>	5 years ago
dailidong	b854d6b77a	[Refactor worker] simplify and optimize config (#2386) ... * simplify config * simplify config * simplify and optimize config	5 years ago
qiaozhanwei	f65ab56d2d	UT modify	5 years ago
qiaozhanwei	1276e0d8e1	refactor-worker merge to dev bug fix	5 years ago
bao liang	785c34bc66	fix bug:master fault tolerance error (#2350) (#2375) ... fix bug: Visit the worker page of the monitoring center, a null pointer occur(#2349) Co-authored-by: baoliang <baoliang@analysys.com.cn>	5 years ago
qiaozhanwei	b45e70f8fa	refactor-worker merge to dev bug fix	5 years ago
qiaozhanwei	2ec668df9b	refactor-worker merge to dev bug fix	5 years ago
qiaozhanwei	223bdec85a	refactor-worker merge to dev bug fix	5 years ago
qiaozhanwei	b5546ddb68	refactor-worker merge to dev bug fix	5 years ago
qiaozhanwei	433b41dd7f	refactor-worker merge to dev bug fix	5 years ago
qiaozhanwei	94713cef79	refactor-worker merge to dev bug fix	5 years ago
qiaozhanwei	be1494fd7f	refactor-worker merge to dev bug fix	5 years ago
zixi0825	69e000b542	#2282 fix workflow dependent bug (#2329) ... * fix workflow dependent bug * fix workflow dependent bug 2 * fix workflow dependent bug 2 Co-authored-by: sunchaohe <sunzhaohe@linklogis.com> Co-authored-by: dailidong <dailidong66@gmail.com>	5 years ago
qiaozhanwei	4bda3cd92c	conflict reslove	5 years ago
Rubik-W	4440b35c4e	fix #2334 (#2335) ... Co-authored-by: dailidong <dailidong66@gmail.com>	5 years ago