Tree: 0419543d81

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 '0419543d81'

${ noResults }

Commit Graph

279 Commits (0419543d817ad012ba534e4aa08d81c932b7ffc3)

Author	SHA1	Message	Date
xingchun-chen	029d3eb814	git actions add submodule (#5280) ... * Add issue robot automatic reply and Translation * add license * git actions add submodule Co-authored-by: chenxingchun <438044805@qq.com>	4 years ago
xingchun-chen	faa111674f	Add issue robot automatic reply and Translation (#5258) ... * Add issue robot automatic reply and Translation * add license Co-authored-by: chenxingchun <438044805@qq.com>	4 years ago
fredster33	9a3ae48396	Update PULL_REQUEST_TEMPLATE.md (#5022) ... When commented out, even if the PR creator forgets to remove the tips, they will not appear in the PR when it is submitted.	4 years ago
Shiwen Cheng	8c68e2c60b	[Fix][Worker] Fix worker cannot start and alertClientService NullPointerException (#4956) ... * [Fix][Worker] Fix worker cannot start * [Fix][Worker] Fix alertClientService NullPointerException * [Fix][Worker] Improve ut coverage * [Improvement][CI] Improve workflow ci	4 years ago
CalvinKirs	55389c0fb0	close e2e test	4 years ago
Shiwen Cheng	a25c3974fc	[Improvement][README] Update official website link in readme (#4903)	4 years ago
Shiwen Cheng	f975489374	[Improvement][SQL] Place the upgraded schema to the correct version directory and check schema errors (#4806) ... * [Improvement][sql] Keep same with 1.3.5-release * [Improvement][sql] Move the sql at the wrong version to 1.4.0 and fix issue #4650 * [Improvement][sql] Fix ci error	4 years ago
Shiwen Cheng	8879d8ff60	[Improvement][*] Define version with revision globally and update version to 1.3.6-SNAPSHOT (#4773) ... * [Improvement][*] Update version to 1.4.0-SNAPSHOT * [Improvement][*] Update tab to space under checkstyle * [Improvement][*] Define version with revision globally * [Improvement][*] Update version to 1.3.6-SNAPSHOT	4 years ago
Shiwen Cheng	d41dd10a16	[Fix][CI] Fix error: unable to resolve action apache/skywalking-eyes@9bd5feb (#4784)	4 years ago
Kirs	878070888a	removed issue label (#4623)	4 years ago
Kirs	73b0eaa999	merge dev to alert_plugin_design (#4530) ... * merge from 1.3.3-release * refactor code style * refactor code style * refactor code style * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * refactor ut test * refactor ut test * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * fix #3900 kill multi yarn app in one job * refactor ut * merge from 1.3.3-release * refactor ut * refactor ut * refactor * refactor * refactor code style * refactor code style * refactor code style * refactor code style * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * add ProcessUtils UT * refactor code style * refactor code style * refactor code style * refactor code style * [Draft][Merge][133-dev]133 merge dev (#4031) * [Feture-3327][ui]Add the function of re-uploading files in the resource center * [Feture-3327][ui]Add the function of re-uploading files in the resource center (#3394) * Before creating a workflow, clear the canvas * [Fix-3256][ui] herry pick commit from dev for Fix admin user info update error (#3306) * [Feture-3327][ui]Add the function of re-uploading files in the resource center Co-authored-by: wuchunfu <319355703@qq.com> * [Improvement-3327][api]support re-upload the resource file (#3395) * [Fix-3390][server]Running hive sql task need find the hdfs path correctly (#3396) * [Fix-3390][api]Running hive sql task need find the hdfs path correctly * [Fix-3390][api]Running hive sql task need find the hdfs path correctly * update soft version * hive UDF function to modify the background color * fix * fix bug: Fix master task dependency check bug * cancel spark task version check (#3406) Co-authored-by: Eights-Li <yelli.hl@gmail.com> * [Bug][ui]Fix front-end bug #3413 * [Feature][ambari_plugin]support one worker can belongs different worker groups when execute install script (#3410) * Optimize dag * Update actions.js (#3401) * [Fix-3256][ui] Fix admin user info update error (#3425) (#3428) * [PROPOSAL-3139] Datasource selection changes from radio to select * [PROPOSAL-3139] Datasource selection changes from radio to select * [BUG FIX] issues #3256 * [BUG FIX] issues #3256 * [BUG FIX] issues #3256 * [Fix-3256][ui] Fix admin user info update error * [Fix-3256][ui] Fix admin user info update error * [Fix-3256][ui] Fix admin user info update error * [Fix-3256][ui] Fix admin user info update error * reset createUser.vue * [Fix-3256][ui] Fix admin user info update error Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: wuchunfu <319355703@qq.com> Co-authored-by: dailidong <dailidong66@gmail.com> * [Fix-3433][api]Fixed that release the imported process definition which version is below 1.3.0 will be failure * dag connection add check * fix * [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x (#3454) * Remove node deep monitoring * If worker group id is null,don't need to set the value of the worker group (#3460) * [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x * [Fix-3423][dao]If worker group id is null,don't need to set the value of the worker group * [ui]Code optimization * fix * fix * [fix-3058][ui]Move rtTargetArr to jsPlumbHandle.js * [optimization][ui]Prevent the shell script input box from being empty * [Fix-3462][api]If login user is admin,need list all udfs (#3465) * [Fix-3462][api]If login user is admin,need list all udfs * [Fix-3462][api]add the test on the method of QueryUdfFuncList * [Fix-3462][api]fix the code smell * [Fix-3462][api]fix the code smell * [Fix-3462][api]fix the code smell * [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource (#3482) * [fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data * [Feture-3327][ui]Add the function of re-uploading files in the udf subdirectory * fix bug: Fix master task dependency check bug (#3473) Co-authored-by: lenboo <baoliang@analysys.com.cn> * [maven-release-plugin] prepare release 1.3.2 * [maven-release-plugin] prepare for next development iteration * fix ci_e2e fail (#3497) * [Fix-3469][api]Should filter the resource by the different program type (#3498) * [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource * [Fix-3469][api]Should list python file and jar file * [Fix-3469][api]Should filter the resource by the different program type * [Fix-3469][api]fix the code smell * test release 1.3.2 version rollback * test release 1.3.2 version rollback * test release 1.3.2 version rollback (#3499) * [Feature] JVM parameter optimization , related issue #3370 * [Feature] JVM parameter optimization , related issue #3370 * test release 1.3.2 version rollback * test release 1.3.2 version rollback Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * [maven-release-plugin] prepare release 1.3.2 * [maven-release-plugin] prepare for next development iteration * [Fix-3469][ui]The value of maintenance resources and the filtering of resources according to different program types * fix * Revert "fix ci_e2e fail (#3497)" This reverts commit e367f90bb7. * test * test release 1.3.2 version rollback * test release 1.3.2 version rollback (#3503) * [Feature] JVM parameter optimization , related issue #3370 * [Feature] JVM parameter optimization , related issue #3370 * test release 1.3.2 version rollback * test release 1.3.2 version rollback * test * test release 1.3.2 version rollback Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * [maven-release-plugin] prepare release 1.3.2 * [maven-release-plugin] prepare for next development iteration * test release 1.3.2 version rollback (#3504) * [Feature] JVM parameter optimization , related issue #3370 * [Feature] JVM parameter optimization , related issue #3370 * test release 1.3.2 version rollback * test release 1.3.2 version rollback * test * test release 1.3.2 version rollback Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * [maven-release-plugin] prepare release 1.3.2 * [maven-release-plugin] prepare for next development iteration * fix ds muti-level directory in zk, which lead to fail to assign work * add login user check some actions in api * [Hotfix][ci] Fix e2e ci docker image build error * modify tag 1.3.0 to HEAD * modify tag 1.3.0 to HEAD (#3525) * [Feature] JVM parameter optimization , related issue #3370 * [Feature] JVM parameter optimization , related issue #3370 * test release 1.3.2 version rollback * test release 1.3.2 version rollback * test * test release 1.3.2 version rollback * modify tag 1.3.0 to HEAD Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * remove OGNL part of the mybaits notice (#3526) * [maven-release-plugin] prepare release 1.3.2 * [maven-release-plugin] prepare for next development iteration * release 1.3.2 version rollback (#3527) * [Feature] JVM parameter optimization , related issue #3370 * [Feature] JVM parameter optimization , related issue #3370 * test release 1.3.2 version rollback * test release 1.3.2 version rollback * test * test release 1.3.2 version rollback * modify tag 1.3.0 to HEAD Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * [ui]Script input box to modify the delay loading time * fix * fix * fix * fix * modify general user can't create token * [ui]It is forbidden to select non-existent resources and modify the tree display data format * modify general user can't create token (#3533) * [Feature] JVM parameter optimization , related issue #3370 * [Feature] JVM parameter optimization , related issue #3370 * test release 1.3.2 version rollback * test release 1.3.2 version rollback * test * test release 1.3.2 version rollback * modify tag 1.3.0 to HEAD * modify general user can't create token Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * if task is null , set task type is null instead of "null" * [Fix-3536][api]If user didn't have tenant,create resource directory will NPE (#3537) * [Fix-3536][api]If user didn't have tenant,create resource will NPE * [Fix-3536][api]If user didn't have tenant,create resource directory will NPE * modify general user can't create,delete,update token (#3538) Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * [ui]Resource delete OK button to increase loading, change the number of homepage display cursor * fix * [Fix-3616][Server] when worker akc/response master exception , async retry (#3748) * [fixbug][ui]Repair the master and worker management instrument display * [Fix-3238][docker]Fix that can not create folder in docker with standalone mode (#3741) * [fixbug][ui]Remove non-existent or deleted resources disabled * [fixBug-3621][ui]If the workflow instance status is executing status, it is forbidden to select * [fix-3553][ui]Repair click workflow connection, select the entire path * fix * fix * [Fix-3238][docker]Fix that can not create folder in docker with standalone mode * [Fix-3616][Server] when worker akc/response master exception , async retry (#3776) * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected. * [Improvement-3720][ui] js mailbox verification fix * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3784) * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected. * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> Co-authored-by: zhuangchong <zhuangchong8@163.com> Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com> * [Fix-3124][docker]Fix that can not build a docker image on windows (#3765) * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3786) * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected. * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> Co-authored-by: zhuangchong <zhuangchong8@163.com> Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com> * [Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException (#3787) * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected. * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect * [BugFixed] issue #3258 (#3265) * 'ExecutionStatus' * '3258' * Update WorkerGroupServiceTest.java * Delete UserState.java * Delete ResourceSyncService.java * Delete core-site.xml * Delete hdfs-site.xml Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> Co-authored-by: zhuangchong <zhuangchong8@163.com> Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com> Co-authored-by: dailidong <dailidong66@gmail.com> * [fixBug-3792][ui]Click on the sidebar to adapt the width of the pie chart on the project homepage * [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715) * fix bug Delete invalid field: executorcores Modify verification prompt * fix bug Delete invalid field: executorcores Modify verification prompt * fix bug Delete invalid field: executorcores Modify verification prompt * dag add close button * reset last version * reset last version * dag add close buttion dag add close buttion * update CLICK_SAVE_WORKFLOW_BUTTON xpath * updae CLICK_SAVE_WORKFLOW_BUTTON xpath * updae CLICK_SAVE_WORKFLOW_BUTTON xpath * updae CLICK_SAVE_WORKFLOW_BUTTON xpath * Update CreateWorkflowLocator.java modify submit workflow button * Update CreateWorkflowLocator.java * Update CreateWorkflowLocator.java modify CLICK_ADD_BUTTON * Update CreateWorkflowLocator.java delete print * Update CreateWorkflowLocator.java 1 * Update CreateWorkflowLocator.java 1 * Setting '-XX:+DisableExplicitGC ' causes netty memory leaks in addition update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M' * Update dag.vue * Update dag.vue * Update dag.vue * Update CreateWorkflowLocator.java * Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks" This reverts commit 3a2cba7a * Setting '-XX:+DisableExplicitGC ' causes netty memory leaks in addition update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M' * Update dolphinscheduler-daemon.sh * catfile method Stream not closed * catfile method Stream not closed Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com> * [Fix-#3713][common]Fix that catfile method Stream not closed * [Fix-#3713][common]Fix that catfile method Stream not closed (#3810) * [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715) * fix bug Delete invalid field: executorcores Modify verification prompt * fix bug Delete invalid field: executorcores Modify verification prompt * fix bug Delete invalid field: executorcores Modify verification prompt * dag add close button * reset last version * reset last version * dag add close buttion dag add close buttion * update CLICK_SAVE_WORKFLOW_BUTTON xpath * updae CLICK_SAVE_WORKFLOW_BUTTON xpath * updae CLICK_SAVE_WORKFLOW_BUTTON xpath * updae CLICK_SAVE_WORKFLOW_BUTTON xpath * Update CreateWorkflowLocator.java modify submit workflow button * Update CreateWorkflowLocator.java * Update CreateWorkflowLocator.java modify CLICK_ADD_BUTTON * Update CreateWorkflowLocator.java delete print * Update CreateWorkflowLocator.java 1 * Update CreateWorkflowLocator.java 1 * Setting '-XX:+DisableExplicitGC ' causes netty memory leaks in addition update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M' * Update dag.vue * Update dag.vue * Update dag.vue * Update CreateWorkflowLocator.java * Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks" This reverts commit 3a2cba7a * Setting '-XX:+DisableExplicitGC ' causes netty memory leaks in addition update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M' * Update dolphinscheduler-daemon.sh * catfile method Stream not closed * catfile method Stream not closed Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com> * [Fix-#3713][common]Fix that catfile method Stream not closed Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com> Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com> * [Fix-#3487][api、dao] cherry pick from dev to fix that create folder duplicate name under multithreading * [Hotfix-3131][api] Fix the new tenant already exists prompt (#3132) * Bugfix: Fix the new tenant already exists prompt * Feature: Add test cases * Update TenantServiceTest.java Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * Set up JDK 11 for SonarCloud in github action. (#3052) * Set up JDK 11 for SonarCloud in github action. * Fix javadoc error with JDK 11. * Prevent Javadoc from stopping if it finds any html errors. * [fixBug-3621][ui]Select the batch checkbox to unfilter the instances in the executing state * add verify tenant name cannot contain special characters. * [fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers * fix * fix * fix * [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it need replace the origin resource file. (#3862) * [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file. * [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file. * [fixbug-3621][ui]Workflow instance ready to stop and ready to suspend state prohibits checking * [fixbug-3887][ui]Fix missing English translation of re-upload files * add process define name verify. (#3879) * Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters." * revert pr 3872 * [FIX-3617][Service]after subtask fault tolerance, 2 task instances are generated (#3830) * fix bug(#3617): after subtask fault tolerance, 2 task instances are generated. * delete unused code * update code smell * refactor sub work command process * add process service ut * add license header * fix some code smell * chang ut java8 to java11 * update sonar to java11 * copy ut config from dev * remove checkstyle * revert to 1.3.3 * change proess service test to executor service * add process service test * add process service test * revert * revert * add comments * change dev to 1.3.3-release * revert Co-authored-by: baoliang <baoliang@analysys.com.cn> * [Fix-#3487][sql] add dolphinscheduler_dml.sql under 1.3.3_schema (#3907) * [FIX-3836][1.3.3-release-API] process definition validation name interface prompt information error (#3899) * fix bug : error message * fix code smell * fix code smell * [FIX_#3789][remote]cherry pick from dev to support netty heart beat * [FIX_#3789][remote]cherry pick from dev to support netty heart beat * [FIX_#3789][remote]cherry pick from dev to support netty heart beat (#3913) * [FIX_#3789][remote]cherry pick from dev to support netty heart beat * [FIX_#3789][remote]cherry pick from dev to support netty heart beat Co-authored-by: Kirs <acm_master@163.com> * Repair check box cannot be canceled * [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly * [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly * [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly (#3918) * [FIX_#3789][remote]cherry pick from dev to support netty heart beat * [FIX_#3789][remote]cherry pick from dev to support netty heart beat * [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly * [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly Co-authored-by: Kirs <acm_master@163.com> * [Fix-#3487][sql] update uc_dolphin_T_t_ds_resources_un * Workflow definition name re-modified and added check * [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly. * update code. * [#3931][ui]Field name optimization for spark, flink, and mr * change version from 1.3.2-SNAPSHOT to 1.3.3-SNAPSHOT (#3934) * [maven-release-plugin] prepare release 1.3.3 * [maven-release-plugin] prepare for next development iteration * [ambari-plugin]change version 1.3.2 to 1.3.3 (#3935) * fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master * [fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty * solve too many files, close logClientService (#3971) * fix #3966 sub process doesnot send alert mail after process instance ending. (#3972) Co-authored-by: baoliang <baoliang@analysys.com.cn> * [Fix-#3618][server] resolve task executed finished but not release the file handle (#3975) * [Fix-#3618][server] resolve task executed finished but not release the file handle * [Fix-#3618][server] resolve task executed finished but not release the file handle * [Fix-#3958][api] files should not be created successfully in the directory of the authorized file * [FIX-3966] The timeout warning does not take effect in sub_process (#3982) * fix #3966 sub process doesnot send alert mail after process instance ending. * fix bug 3964: sub_process The timeout warning does not take effect add timeout warning for sub_process/dependent task. * fix code smell * fix code smell * fix code smell * update worker group inherit from parent Co-authored-by: baoliang <baoliang@analysys.com.cn> * fix import dolphinscheduler_mysql.sql insert admin user data * [FIX-3929] condition task would post wrong tasks when failover. (#3999) * fix #3966 sub process doesnot send alert mail after process instance ending. * fix bug 3964: sub_process The timeout warning does not take effect add timeout warning for sub_process/dependent task. * fix code smell * fix code smell * fix code smell * update worker group inherit from parent * remove stdout in logback configuration * fix bug #3929 condition task would post error when failover. * remove unused test * add comments * add skip node judge Co-authored-by: baoliang <baoliang@analysys.com.cn> * [FIX-3929] because of no lock, start up failover would dispatch two same tasks. (#4004) * fix #3966 sub process doesnot send alert mail after process instance ending. * fix bug 3964: sub_process The timeout warning does not take effect add timeout warning for sub_process/dependent task. * fix code smell * fix code smell * fix code smell * update worker group inherit from parent * remove stdout in logback configuration * fix bug #3929 condition task would post error when failover. * remove unused test * add comments * add skip node judge * fix bug 3929: because of no lock, start up failover would dispatch two same tasks. Co-authored-by: baoliang <baoliang@analysys.com.cn> * revert pom version to 1.3.3-release * [maven-release-plugin] prepare release 1.3.3 * [maven-release-plugin] prepare for next development iteration * [release]revert pom version to 1.3.3-release * fix bug 4010: remove failed condition tasks from error-task-list. (#4011) Co-authored-by: baoliang <baoliang@analysys.com.cn> * [maven-release-plugin] prepare release 1.3.3 * [maven-release-plugin] prepare for next development iteration * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * refactor code style * refactor code style * refactor code style * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * refactor ut test * refactor ut test * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * refactor ut * merge from 1.3.3-release * refactor ut * refactor ut * refactor * refactor * refactor code style * refactor code style * refactor code style * refactor code style * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * refactor code style Co-authored-by: break60 <790061044@qq.com> Co-authored-by: wuchunfu <319355703@qq.com> Co-authored-by: lgcareer <18610854716@163.com> Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com> Co-authored-by: lenboo <baoliang@analysys.com.cn> Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> Co-authored-by: Yelli <amarantine@my.com> Co-authored-by: Eights-Li <yelli.hl@gmail.com> Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com> Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> Co-authored-by: XiaotaoYi <v-xiayi@hotmail.com> Co-authored-by: Yichao Yang <1048262223@qq.com> Co-authored-by: zhuangchong <zhuangchong8@163.com> Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com> Co-authored-by: muzhongjiang <mu_zhongjiang@163.com> Co-authored-by: Jave-Chen <baicai.chen@gmail.com> Co-authored-by: zhuangchong <zhuangchong6@163.com> Co-authored-by: zhuangchong <37063904+zhuangchong@users.noreply.github.com> Co-authored-by: Kirs <acm_master@163.com> Co-authored-by: lgcareer <lgcareer@apache.org> Co-authored-by: wulingqi <wulingqi@baijiahulian.com> * Revert "[Draft][Merge][133-dev]133 merge dev (#4031)" (#4057) This reverts commit ad2d9f99d0. * [Fix][API] Condition task null pointer exception (#4056) * add ProcessUtils UT * modify ProcessUtils & ProcessUtilsTest * Enhance user experience, add close button, return to the previous page (#4006) Co-authored-by: zhanglong <zhanglong@ysstech.com> * [FIX_BUG][server-test] dismiss of server warm-up time in RoundRobinSelectorTest (#4067) * [Fix][api] Fix build parameter error of sqlserver when create. (#4015) * [fix-#3962][api] Avoid ClassCastException for LoggerService.queryLog(). * [Fix][api] Fix build parameter error of sqlserver when create. * [Feature-3985][Datax] Datax supports setting up running memory (#3986) * Datax supports setting up running memory * Datax supports setting up running memory * Datax supports setting up running memory * When running a task, the resource file is lost, which results in an error * add unit test * add unit test * add unit test * add test unit * add test unit * add test unit * fix code smell * add test unit * add test unit * [Improvement-3767][api] Task instance supports query by process instance name (#3825) * Task instance supports query by process instance name. * add test code checkstyle. * add test param. * resolve the sonar duplication check. * solve logger single-line string exceeds 200 characters. * resolve the sonar check. * Resolve code conflicts. Co-authored-by: zhuangchong <zhuangchong8@163.com> * deal with magic value * [Feature-4050][server] Spark task support udv inject (#4061) * #4050 spark task support udv inject * modify spark task UT * modify sparkTaskExecutionCtx * add exp for spark task get main jar method * deal with magic value * [Improvement-3471][common] JSONUtils.toMap It is not necessary to check whether the JSON method is empty again. #3471 (#3481) * JSONUtils.toMap call improvement. * [Fix-4054][Api] Fix The last week of the month for adding/editing timing, preview and save timing will report an error * 解决单独执行子节点空指针的问题 * using OSUtils.execCmd when kill yarn app * 解决单独执行子节点空指针的问题(增加checkstyle) * 解决单独执行子节点空指针的问题(增加checkstyle) * [FIX-#4083][server]fix taskInstance state change error Concurrent processing of ack message and result message causes the execution sequence to be wrong # this close # 4083 * code style * fix replaceNRTtoUnderline NullPointerException #4098 (#4100) * fix replaceNRTtoUnderline NullPointerException * add unit Test * add taskResponseTest * add taskResponseTest * code smell * Time is too small and the task is not finished * Time is too small and the task is not finished * [FIX-4034][server] fix sqoop import fail (#4036) * fix #4043, sqoop import query fail * fix #4043, sqoop task hard code & code style * add license for SqoopConstants * add private constructor for SqoopConstants * fixed sqoop mysql pwd have special character * fix checkstyle * fix sqoop task log * remove unused constants * Time is too small and the task is not finished * Time is too small and the task is not finished * test * remove assert * test * test * fix task instance status judgment error * fix: security page disappear delay problem when force refresh under GENERAL_USER * improvement: resovle download url with resolveURL to prevent change of apiPrefix * fix sqoop task jdbc string contains special char (#4105) * [Bug][Common] read file garbled (#3479) * fix bug : Random code problem Co-authored-by: zhanglong <zhanglong@ysstech.com> * [Improvement-3933][db operation] Improve the performance of sql query (#3940) * optimize select * case * emove redundancy * bug fixed * Update en_US.js * Update startup.sh * optimize * optimize code * optimize * bug fixed * add ut * bug fixed * bug fixed * bug fixed * bug fixed * Delete WorkFlowLineageMapper.xml * Delete createTenement.vue * recove wrongly deleted file * Update WorkFlowLineageMapper.xml * Update createTenement.vue * [Feature][API]enable response resources gzip compression (#4121) * enable response compression * add server.compression.mime-types with default value explicitly * [Improvement][API] ignore noNodeException when get worker groups (#4120) * ignore noNodeException when get worker groups * add ut * [Improvement][Code style] FIX SPELL WAITTING TO WAITING , etc. (#4118) * FIX SPELL * FIX SPELL AND Optimizing code conventions * add ut cannot construct process instance, return null; * add ut testExportProcessMetaData * add ut testExportProcessMetaData * add ut testImportProcessSchedule * add ut MasterExecThreadTest * add ut MasterExecThreadTest * add ut testSubProcessViewTree * add ut testComplementWithStartNodeList * add ut testRecurseFindSubProcessId * add ut testRecurseFindSubProcessId * add ut testRecurseFindSubProcessId * [FIX#4033] $[] conflicts with mysql keywords (#4111) * [FIX#4033] $[] conflicts with mysql keywords We currently only use this symbol for dates, so I filtered out the number type. this close #4033 * test * fix error * split sqoop import hive database and table (#4141) * upgrade quartz version to 2.3.0 * add HikariCP-java6,c3p0,mchange-commons-java license * upgrade jackson version to 2.9.10 * start from force success * correct param name * correct names * remove c3p0,mchange-commons-java license * update Check code style * update code style * Update pom.xml * Update pom.xml * Update LICENSE not need to add HikariCP-java6 * Delete LICENSE-HikariCP-java6.txt * Update known-dependencies.txt * Update TaskInstanceMapper.xml optimize page of [TaskInstance] load data slow * [FIX-PR-4097][server-master]task ack miss (#4189) When the message of successful execution arrives earlier than the message of ack, the message of ack will be discarded, resulting in some information missing * fix bug #4125 (#4127) * fix bug #4125 * code style! * code style. Co-authored-by: chengp <chengp@chengp.net> * [FIX-4190][DAO] When the amount of json data is large, the process list page display slowly. (#4201) * fix 4190: When the amount of json data is large, process list page display slowly * fix 4190: When the amount of json data is large, process list page display slowly * fix 4190: When the amount of json data is large, process list page display slowly Co-authored-by: baoliang <baoliang@analysys.com.cn> * [Fix-3457][flink] fix flink args build problem (#4166) * [Fix][Flink] fix flink args build problem * [Fix][Flink] fix FlinkArgsUtilsTest * [Improvement][UI] hide version and cluster input when deployMode is local * [common]del windows file( not support windows ) (#4204) * del support win * del support win * [Feature-4138][Master] dispatch workgroup error add sleep time (#4139) * When there are tasks with assignment failure and the number of tasks in the current task queue is less than 10, sleep for 1 second * When there are tasks with assignment failure and the number of tasks in the current task queue is less than 10, sleep for 1 second * fix code smell & code style * fix code smell & code style Co-authored-by: zhanglong <zhanglong@ysstech.com> * [FIX-#4172][server-worker] kill task NPE (#4182) * [FIX-#4172][server-worker] kill task NPE The cache task will be sent when the Process is generated. Before that, if a kill task appears, then NPE will appear Modification method: write into the cache when the task is received, and mark it as preData If the task is killed before the Process is generated, delete the cache directly at this time It will be judged before the process is generated. If the task has been killed, it will not be executed. After the new process is created, write it into the cache, and judge again, if kill, then kill the process. this closes #4172 * Delete the commented out code Add spring beans * code smell * add test * add test * fix error * test * test * revert * fix error * [Feature-3878]Replace the page with element-ui (#4065) * [Feature-3878]Introduce elment-ui and replace the security center module page with elment-ui * Change node version * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * Replace the page with element-ui * Replace user management with elment-ui * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * Repair the last Sunday of each month * support auto eslint for .js, .vue file on save * update .eslintrc.yml and license check exclude .eslintignore * fix eslint: fix syntax by npm run lint automatically * fix eslint: fatal syntax errors * fix eslint: expected '!==' but instead saw '!=', expected '===' but instead saw '==' * fix eslint: Unexpected side effect in 'cacheParams' computed property * fix eslint: assigned a value but never used * fix eslint: component has been registered but not used * fix eslint: unexpected mutation of prop * fix bug: start from the setting nodes with NODE_PRE would be NPE. (#4219) * deleted invalid code as assigned in issue 4215 (#4221) deleted the code at following two places: org.apache.dolphinscheduler.service.process.ProcessService#checkTaskExistsInTaskQueue org.apache.dolphinscheduler.service.process.ProcessService#taskZkInfo * [FIX-#3177]Task time parameter parsing error (#4224) * [FIX-#3177]Task time parameter parsing error rerun schedule time error this closes #3177 * [FIX-#3177]Task time parameter parsing error rerun schedule time error this closes #3177 * fix sql error (#4227) * [FIX-3177]Task time parameter parsing error (#4228) * [FIX-3177]Task time parameter parsing error when system.datetime !=null $[datetime] = system.datetime else $[datetime] = current time * remove unused import * fix date_convert null * fix time cover * fix time cover * reformat * add ut * [Fix][UI]: fix re-login problem in new tab and state synchronization problem in multiple tabs (#4162) * fix(ui): re-login problem in new tab * refresh page in new tab automatically * support to reload router view in lightweight * optimize visibility code * [Improvement][UI] Add no-var rule for eslint and add 'npm run lint:fix' command (#4225) Add no-var rule for eslint, and fix related files Add npm run lint:fix command, which distinguished from the default command npm run lint The behavior of command npm run lint and command npm run lint:fix should be distinguished The first command is used to lint only, and the second one is used to lint and fix problems automatically * [FIX][UI ] security user state tenantCode User Type Display abnormal (#4255) * fix user state error * fix userType error * fix tenantCode error * [Fix-4222][Master]Add the priority queue to ensure that tasks are submitted according to priority. (#4250) * [Fix-4222][Master]Add the priority queue to ensure that tasks are submitted according to priority. * [Fix-4222][Master]Add the priority queue to ensure that tasks are submitted according to priority. * [Fix-4222][Master]Remove useless import * [Fix-4222][Master]Reformat code style * [Fix-4222][Master]Reformat code style * [Fix-4222][Master]Reformat code style * [Fix-4222][Master]add PeerTaskInstancePriorityQueueTest * [Fix-4222][Master]Fix code smell * [Fix-4222][Master]Reformat code style * [Fix-4222][Master]Fix code smell Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com> * update bug template (#4260) * add pasue icon button and adjust operation button style * Align each item one by one in locale * match frontend and backend for force success * [Improvement-4069][server] When the tenant does not exist, the task execution should throw an exception (#4108) * when the tenant does not exist, the task execution should throw an exception * remote method createWorkDirAndUserIfAbsent * set the task status failed when the tenant code does not exist. * add taskLog. * update check os user exists * update TaskExecuteThreadTest test method. * solving sonar fail. * remove AbstractTask.getCurTaskParamsClass()and replace with TaskParametersUtils.getParameters() (#4262) * remove getCurTaskParamsClass() in AbstractTask.java and replace it with TaskParametersUtils.getParameters() * remove unused imports in AbstractTask.java * reformat * fix code style and test * [Fix-4271][server] Fix IOException or NoSuchFileException in logger server (#4272) * fix version funcation delete. (#4265) * [improvement][config] Update datasource.properties，add mysql meta data template (#4266) * Update datasource.properties [新增]元数据mysql连接模版 * Update datasource.properties Co-authored-by: dailidong <dailidong66@gmail.com> * fix taskInstance submitTime is empty. (#4274) * [Improvement-3878]Tenant list delete user name (#4278) * [Fix-4268] Fix NumberFormatException when visiting a doc.html or swagger-ui.html (#4269) * [Fix-4268] Fix NumberFormatException when visiting a doc.html or swagger-ui.html * Fix checkstyle error * Update swagger-models in known-dependencies.txt * [Improvement-3878][ui]Fix the list style (#4280) * [Improvement-3878]Tenant list delete user name * [Improvement-3878][ui]Fix the list style * [FIX] [UI] fix create project cancel button invalid (#4282) * fix create project cancel button invalid * [Improvement] Refactor code to support distributed tracing (#4270) * Refactor code to support tracing * Extension network protocol, support context and version * Extension master asynchronous queue support context * Extract scan task method from MasterSchedulerService for tracing * fix * fix * add test case * fix * fix Co-authored-by: hailin0 <hailin0@yeah.net> * [Improvement] Add Flink job name (#4285) * [Improvement] Add Flink job name * fix typo * [Improvement][ui]List vacancy optimization and icon icon repair (#4286) * [Improvement][ui] List vacancy optimization and icon icon repair * adjust locale for new pr * [FEATURE-736] integrate ldap authentication (#3743) * [FEATURE-736] integrate ldap authentication * add ldap authentication type * refactor authentication with ldap and password * add createUser for ldap in user service * remove duplicate password authenticator * [Fix-4289][*] Flink name with disappeared and unescaped problem (#4290) * fix flink name not display in process definition editor * fix flink name not escape problem * simplify escape method * fix database is the mysql DB keyword. (#4295) * fix the token management list does not display the user name. (#4302) * Dev imp server process utils (#4263) * Adds the comment on the WINDOWSATTERN Co-authored-by: Kirs <acm_master@163.com> Co-authored-by: 0002939 <licongyang@mininglamp.com> * fix version close function does not take effect. (#4307) * fix user management authorization operation exceptions do not prompt exception information. (#4292) * [Fix][UI] Fix ui style problem and refactor form style (#4329) * rename from-model to form-model * [UI] remove duplicated css style code * [UI] refactor css style of form model * fix form model overflow problem in ie * Align each item one by one in locale * fix el-dialog width is too wide * fix locale * [Improvement][UI] Improve script box and dialog css style (#4331) * [Fix-4335][UI] Fix IE 9-11 not supported * [FIx-4338][UI] Fix invalid date problem in IE * [Improvement] Use environment variable $DOLPHINSCHEDULE_OPTS as daemon startup arguments (#4341) Co-authored-by: hailin0 <hailin0@yeah.net> * [Fix][common] only two yarns can be selected(#4314) (#4344) * modify_Status (#4352) Co-authored-by: zt-1997 <“18841012545@163.com”> * fix the page does not refresh after clicking the delete function.. (#4360) * [FIX-4326][UI] Add description field to data source list (#4362) * [Feature-4318][API] Rename tenant code (#4320) Rename tenant code Rename tenant code (English version) Rname tenant name in ui label Rname TENANT_CODE_EXIST to OS_TENANT_CODE_EXIST Rname enum TENANT_CODE_* to OS_TENANT_CODE_* * [Fix-3233][api-server] Fix the bug when compile the code in Java9 env (#4312) * [Fix-3233][api-server] Fix the bug when compile the code in Java9 env delete release-docs/licenses/LICENSE-jsp-api-2.1-6.1.14.txt delete ant-1.6.5.jar core-3.1.1.jar jsp-api-2.1-6.1.14.jar delete LICENSE-ant-1.6.5.txt,LICENSE-core-3.1.1.txt delete maven repository address of ant-1.6.5.jar ,core-3.1.1.jar ,jsp-api-2-1-6.1.14.jar Co-authored-by: 李长福 <changfu.li@dmall.com> * [Improvement][ui] Introduce remixicon, delete ans-ui license and font-awesome (#4313) * [Improvement-3878]Tenant list delete user name * [Improvement-3878][ui]Fix the list style * [Improvement][ui] List vacancy optimization and icon icon repair * Add font-awesome license and delete ans-ui license * Introduce remixicon * [Improvement-4257][api] Increase "queryProcessDefinitionByName" API (#4390) * 1. Increase "queryProcessDefinitionByName" API. 2. Will queryProcessDefinitionById api "PROCESS_INSTANCE_EXIST" state is modified to "PROCESS_DEFINE_NOT_EXIST". * Correct spelling mistakes in words * Logging should not be vulnerable to injection attacks Co-authored-by: yinyong <yinyong@netposa.com> * remove the operation resume_from_forced_success * refactor code styles * readme file fixed (#4374) * readme fix * readme fix * readme fix * readme fix * readme fix Co-authored-by: TinaPang <pangtianyang@analysys.com.cn> * [Fix-4293][UI] Fix data loss in switched tab (#4415) * [Fix-4293][UI] Fix data loss in switched tab * The disclaimer should be same with the website * [Improvement][UI] Rename disabled to enabled in menu (#4414) * [Feature-#130] pass global param values when starting new process instance (#4372) * [DS-130][feat] pass global param values when starting new process instance add optional param for start-process-instance api reuse command_param in command table for persistence overload curingGlobalParams function in ParameterUtils not adapt the UI code yet * change import order * support datetime expression * print start params * (fix) avoid npe when cmdParam is null Change-Id: I3b4c4b5fa1df316ff221e27146e45d7d4d3a404e * fix alert-spi error todo sql script * [DS-4396][feat] Add project information to email alert message (#4413) * [DS-4396][feat] Add project information to email alert message - build find project and user sql to ProjectMapper - add project information to alert db. * [DS-4396][style] change style * add page query plugin instance add plugin instance check name * add page query plugin instance add plugin instance check name * add props field * ding talk some filed is not required * fix bug * [Improvement][UI] Correct spelling mistakes (#4440) * fix error * revert * [FEATURE-4451][API]After the workflow editing page is submitted, the user chooses whether to go online or not. 0 means not to go online, 1 means online. (#4437) * vvvv * vvvvv * vvvvv * testReleaseProcessDefinition Co-authored-by: zt-1997 <“18841012545@163.com”> * [Feature-4428][dao、UI] It is recommended to add an owner in the data source center and the Resource Center to make it easier to manage (#4442) * add owner to datasource list and resource list * add owner to datasource list and resource list Co-authored-by: bobqiu <xiaoqiu369@gmail.com> * [Fix-4455][common] fix parse shell output (#4456) * add name field provide to ui * [FIX][UT]testVerifyTenantCode assert error (#4460) * [FIX][UT]testVerifyTenantCode assert error * [FIX][UT]testVerifyTenantCode assert error * code smell * fix the exception of update null point of workflow instance due to no… (#4459) * fix the exception of update null point of workflow instance due to not add global parameter when create workflow definition * optimization of the leading package Co-authored-by: yaoshui <huangqitao@accesscorporate.com.cn> * chore: set up license-eye to check license headers (#4453) * [Improvement][alert] Refactor alert module to fix code smell (#4434) * chore: Refactore dolphinscheduler-alert to fix code smell * chore: Refactor code to fix codestyle error * fix: use shellformat(shfmt) and shellcheck fix mvnw (#3692) use shellformat(shfmt) and shellcheck fix mvnw * [Feature-4451][UI]: add an option to the UI page for saving the workflow definition: whether to go online? online by default (#4474) Co-authored-by: linyanbin <linyanbin@lizhi.fm> * [FIX-4247][Api]Fixed the problem that the global parameters are not updated after the workflow instance click rerun Co-authored-by: zt-1997 <“18841012545@163.com”> * [Improvement-4435][datasource] the datasource tests the connection and returns details when the connection is wrong (#4436) * add datasource test connection return result message. * add code checkstyle. * spark/hive datasoure test connection add loadKerberosConf. * solve sonarcloud coverage. * [Improvement-4480][API] change method checkAdmin to isNotAdmin (#4483) * change method 'checkAdmin' to 'isNotAdmin', for better understand. Co-authored-by: 蒙强 <mengqiang@zhongan.com> * fix send error * add ui * delete useless constant definitions code style * code style * fix license head error * [Improvement-#4481][API] ProcessDefinitionController save API optimization Co-authored-by: lei.zou <lei.zou@rootcloud.com> * fix ut error * fix ut error * del unused jar * [Feature-4423][UI] When the process definition is running, the pop-up box can manually set the global parameters. (#4433) * [DS-130][feat] pass global param values when starting new process instance add optional param for start-process-instance api reuse command_param in command table for persistence overload curingGlobalParams function in ParameterUtils not adapt the UI code yet * change import order * support datetime expression * print start params * (fix) avoid npe when cmdParam is null Change-Id: I3b4c4b5fa1df316ff221e27146e45d7d4d3a404e * [Feature-4423][UI] When the process definition is running, the pop-up box can manually set the global parameters (frontend) adapt the UI code (backend-fix) add empty string check for param Change-Id: I710db55f5059f8bd324c79f4494f2798d58e7b19 * add Startup parameters label Change-Id: I5ac82031ea1b64abec330ee8cf2991477a28fcaa * reuse i18n label Change-Id: I5f322cb1dd8e2cade0c679bd025fc984e31bf3ae * import alert-plugin * upgrade jboss-logging * upgrade jboss-logging * fix ut error * fix Vulnerabilities * fix Vulnerabilities * fix Vulnerabilities * code smell * [fix-4472][DataSource] Hive JDBC partial permission parameter concatenation JDBC URL error (#4473) * Solve the problem of parameter splicing of permission part in Hive JDBC URL. * update code style. * add test check in pom.xml. * [FIX-#4468] [UI] Workflow relationships Name filtering invalidated #4508 Co-authored-by: 花花 <huahua@thinkingdata.cn> * fix Vulnerabilities * add public constructors * fix Vulnerabilities * [NOTICE Update]Update year to 2021 (#4521) * [feat-4496][server] Add to! {} is used to mark the custom parameters to be output as-is in sql (#4497) * feat([server]): Add to! {} is used to mark the custom parameters to be output as-is in sql Before pre-compiling sql, replace the custom parameters marked with !{} to prevent the parameters in the hive plus partition path from being replaced with single quotes Closes This closes #4496 * feat([server]): Add to! {} is used to mark the custom parameters to be output as-is in sql Before pre-compiling sql, replace the custom parameters marked with !{} to prevent the parameters in the hive plus partition path from being replaced with single quotes Closes This closes #4496 * feat([server]): Add to! {} is used to mark the custom parameters to be output as-is in sql Before pre-compiling sql, replace the custom parameters marked with !{} to prevent the parameters in the hive plus partition path from being replaced with single quotes Closes This closes #4496 * resolve conflicts * add eg * add eg * code style * revert mysql config Co-authored-by: baoliang <baoliang@analysys.com.cn> Co-authored-by: Eights-LI <yelli.eights@gmail.com> Co-authored-by: bao liang <29528966+lenboo@users.noreply.github.com> Co-authored-by: break60 <790061044@qq.com> Co-authored-by: wuchunfu <319355703@qq.com> Co-authored-by: lgcareer <18610854716@163.com> Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com> Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> Co-authored-by: Yelli <amarantine@my.com> Co-authored-by: Eights-Li <yelli.hl@gmail.com> Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com> Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> Co-authored-by: XiaotaoYi <v-xiayi@hotmail.com> Co-authored-by: Yichao Yang <1048262223@qq.com> Co-authored-by: zhuangchong <zhuangchong8@163.com> Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com> Co-authored-by: muzhongjiang <mu_zhongjiang@163.com> Co-authored-by: Jave-Chen <baicai.chen@gmail.com> Co-authored-by: zhuangchong <zhuangchong6@163.com> Co-authored-by: zhuangchong <37063904+zhuangchong@users.noreply.github.com> Co-authored-by: lgcareer <lgcareer@apache.org> Co-authored-by: wulingqi <wulingqi@baijiahulian.com> Co-authored-by: hailin0 <hailin0@yeah.net> Co-authored-by: zhanglong <zhanglong@ysstech.com> Co-authored-by: t1mon <178317391@qq.com> Co-authored-by: yangquan <iyeeku@qq.com> Co-authored-by: liliang1991 <liliang_68@126.com> Co-authored-by: liang.li.c <liang.li.c@17zuoye.com> Co-authored-by: felix.wang <59079269+felix-thinkingdata@users.noreply.github.com> Co-authored-by: chengshiwen <chengshiwen0103@gmail.com> Co-authored-by: yinancx <mockibird@live.cn> Co-authored-by: Yarlung <turingdojo@163.com> Co-authored-by: karlsun <karlsun@tencent.com> Co-authored-by: 曹聚阳 <yinancx@live.com> Co-authored-by: wangxj3 <857234426@qq.com> Co-authored-by: chengp <5058557@qq.com> Co-authored-by: chengp <chengp@chengp.net> Co-authored-by: Saksham Gupta <saksham1319@gmail.com> Co-authored-by: Tq <36755957+Tianqi-Dotes@users.noreply.github.com> Co-authored-by: Jatham <59549328+Jatham922@users.noreply.github.com> Co-authored-by: hailin0 <hailin0@foxmail.com> Co-authored-by: zh0122 <zh0122@gmail.com> Co-authored-by: geosmart <geosmart@hotmail.com> Co-authored-by: 李丛阳 <liby-1987@163.com> Co-authored-by: 0002939 <licongyang@mininglamp.com> Co-authored-by: kamisamak <1057372918@qq.com> Co-authored-by: zt-1997 <41983395+zt-1997@users.noreply.github.com> Co-authored-by: zt-1997 <“18841012545@163.com”> Co-authored-by: xiaojingXU <68894048+xxjingcd@users.noreply.github.com> Co-authored-by: guohaozhang <zhishengqianjun@gmail.com> Co-authored-by: cooper <1322849632@qq.com> Co-authored-by: 李长福 <changfu.li@dmall.com> Co-authored-by: yy0812 <32183971+yy0812@users.noreply.github.com> Co-authored-by: yinyong <yinyong@netposa.com> Co-authored-by: ptyp <30622951+ptyp@users.noreply.github.com> Co-authored-by: TinaPang <pangtianyang@analysys.com.cn> Co-authored-by: Dean Wong <wangding85@gmail.com> Co-authored-by: K.O <okoahin@gmail.com> Co-authored-by: qiubo <38316980+qiubo369@users.noreply.github.com> Co-authored-by: bobqiu <xiaoqiu369@gmail.com> Co-authored-by: Hxssssss <huangqt1992@163.com> Co-authored-by: yaoshui <huangqitao@accesscorporate.com.cn> Co-authored-by: Zhenxu Ke <kezhenxu94@apache.org> Co-authored-by: Segun Ogundipe <davephenoms@gmail.com> Co-authored-by: xiagw <fxiaxiaoyu@gmail.com> Co-authored-by: linyanbin666 <35388422+linyanbin666@users.noreply.github.com> Co-authored-by: linyanbin <linyanbin@lizhi.fm> Co-authored-by: qmengss <qmengss@users.noreply.github.com> Co-authored-by: 蒙强 <mengqiang@zhongan.com> Co-authored-by: 青年 <1043706593@qq.com> Co-authored-by: lei.zou <lei.zou@rootcloud.com> Co-authored-by: 小二黑 <784445949@qq.com> Co-authored-by: 花花 <huahua@thinkingdata.cn> Co-authored-by: liuxuedongcn <46193861+liuxuedongcn@users.noreply.github.com>	4 years ago
Zhenxu Ke	a6becd8c26	chore: set up license-eye to check license headers (#4453)	4 years ago
Kirs	4d553603ee	Merge dev to alert_plugin_design (#4351) ... * fixed queryProcessInstanceListPaging query slow (#3893) because queryProcessInstanceListPaging has contain longtext type field by instance.*,so queryProcessInstanceListPaging query slow , but longtext field not used. * fixed queryTaskInstanceListPaging query slow (#3892) because queryTaskInstanceListPaging has contain longtext type field by instance.*,so queryTaskInstanceListPaging query slow , but longtext field not used. * add verify tenant name cannot contain special characters. (#3865) * [Fix][Docker] fix startup.sh variables cannot reference in single quotes. (#3895) * [Fix][Docker] fix startup.sh variables cannot reference in single quotes.(#3894) Signed-off-by: YoungMan <bushengquan@gmail.com> * Update Dockerfile update the comment and delete the maridb client Co-authored-by: dailidong <dailidong66@gmail.com> * [ambari-plugin]change version 1.3.2 to 1.3.3 (#3935) * [CodeClean][DAO]Remove redundant comments (#3939) * fix bug Delete invalid field: executorcores Modify verification prompt * fix bug Delete invalid field: executorcores Modify verification prompt * fix bug Delete invalid field: executorcores Modify verification prompt * dag add close button * reset last version * reset last version * dag add close buttion dag add close buttion * update CLICK_SAVE_WORKFLOW_BUTTON xpath * updae CLICK_SAVE_WORKFLOW_BUTTON xpath * updae CLICK_SAVE_WORKFLOW_BUTTON xpath * updae CLICK_SAVE_WORKFLOW_BUTTON xpath * Update CreateWorkflowLocator.java modify submit workflow button * Update CreateWorkflowLocator.java * Update CreateWorkflowLocator.java modify CLICK_ADD_BUTTON * Update CreateWorkflowLocator.java delete print * Update CreateWorkflowLocator.java 1 * Update CreateWorkflowLocator.java 1 * Setting '-XX:+DisableExplicitGC ' causes netty memory leaks in addition update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M' * Update dag.vue * Update dag.vue * Update dag.vue * Update CreateWorkflowLocator.java * Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks" This reverts commit 3a2cba7a * Setting '-XX:+DisableExplicitGC ' causes netty memory leaks in addition update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M' * Update dolphinscheduler-daemon.sh * Remove redundant comments ProcessInstanceMapper# queryProcessInstanceListPaging * Remove redundant comments ProcessInstanceMapper# queryProcessInstanceListPaging Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com> * fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master * When running a task, the resource file is lost, which results in an error * When running a task, the resource file is lost, which results in an error * When running a task, the resource file is lost, which results in an error * [Fix][api] Add queryProjectCreatedAndAuthorizedByUser function (#3658) * fix getLoginUserCreated bug * fix getLoginUserCreated bug 1 * fix checkstyle * modify function name * modify comment * fix unit test error * rollback sqoop task hive target file Co-authored-by: sunchaohe <sunzhaohe@linklogis.com> Co-authored-by: dailidong <dailidong66@gmail.com> * When running a task, the resource file is lost, which results in an error * When running a task, the resource file is lost, which results in an error * [fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty * solve too many files, close logClientService (#3971) * fix #3966 sub process doesnot send alert mail after process instance ending. (#3972) Co-authored-by: baoliang <baoliang@analysys.com.cn> * [Fix-#3618][server] resolve task executed finished but not release the file handle (#3975) * [Fix-#3618][server] resolve task executed finished but not release the file handle * [Fix-#3618][server] resolve task executed finished but not release the file handle * [Fix-#3958][api] files should not be created successfully in the directory of the authorized file * [FIX-3966] The timeout warning does not take effect in sub_process (#3982) * fix #3966 sub process doesnot send alert mail after process instance ending. * fix bug 3964: sub_process The timeout warning does not take effect add timeout warning for sub_process/dependent task. * fix code smell * fix code smell * fix code smell * update worker group inherit from parent Co-authored-by: baoliang <baoliang@analysys.com.cn> * [fix-#3962][api] Avoid ClassCastException for LoggerService.queryLog(). (#3963) * Enhance user experience, add close button to file details page * [Test-3557][API] full cover DataAnalysisServiceImpl (#3605) * generate equals and hashCode method * make up for the state of oblivion * simplify countQueueState method * delete try catch, because this never throw exception * full cover DataAnalysisServiceImpl * improve test coverage * adjust code style * simplify countCommandState method * reduce duplication * simplify countTaskDtos method * Update DataAnalysisServiceImpl.java Co-authored-by: dailidong <dailidong66@gmail.com> * fix import dolphinscheduler_mysql.sql insert admin user data * [FIX-3929] condition task would post wrong tasks when failover. (#3999) * fix #3966 sub process doesnot send alert mail after process instance ending. * fix bug 3964: sub_process The timeout warning does not take effect add timeout warning for sub_process/dependent task. * fix code smell * fix code smell * fix code smell * update worker group inherit from parent * remove stdout in logback configuration * fix bug #3929 condition task would post error when failover. * remove unused test * add comments * add skip node judge Co-authored-by: baoliang <baoliang@analysys.com.cn> * [FIX-3929] because of no lock, start up failover would dispatch two same tasks. (#4004) * fix #3966 sub process doesnot send alert mail after process instance ending. * fix bug 3964: sub_process The timeout warning does not take effect add timeout warning for sub_process/dependent task. * fix code smell * fix code smell * fix code smell * update worker group inherit from parent * remove stdout in logback configuration * fix bug #3929 condition task would post error when failover. * remove unused test * add comments * add skip node judge * fix bug 3929: because of no lock, start up failover would dispatch two same tasks. Co-authored-by: baoliang <baoliang@analysys.com.cn> * revert pom version to 1.3.3-release * [maven-release-plugin] prepare release 1.3.3 * [maven-release-plugin] prepare for next development iteration * the resources API document does not match the interface parameters * [release]revert pom version to 1.3.3-release * fix bug 4010: remove failed condition tasks from error-task-list. (#4011) Co-authored-by: baoliang <baoliang@analysys.com.cn> * [maven-release-plugin] prepare release 1.3.3 * [maven-release-plugin] prepare for next development iteration * fix bug * reset code * Update udfs.vue * [Feature-3941][ui] Remove tenant name (#3949) * FeatureUI-3941: Removed Tenant * FeatureUI-3941: Removed tenantName in the suggested pages * FeatureUI-3941: Updated the suggested files * FeatureUI-3941: Updated the TenantController * FeatureUI-3941: Updated the TenantController and the pom.xml * FeatureUI-3941: Updated the TenantControllerTest * [Improvement][script] daemon script usage (#3968) * Improvement daemon script usage * don't remove status command don't remove status command Co-authored-by: dailidong <dailidong66@gmail.com> * fix #3688, Optimization of table building statements (#3689) * merge from 1.3.3-release * merge from 1.3.3-release * [Improvement-4012][common/remote] Json util code integration,remove the remote module json util (#4013) * Json util code integration,remove the remote module json util. * update code checkstyle. * update code checkstyle. * add code checkstyle. * add test class. * update JSONUtils class. * update JSONUtils class. * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * refactor code style * refactor code style * refactor code style * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * refactor ut test * refactor ut test * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * fix #3900 kill multi yarn app in one job * refactor ut * merge from 1.3.3-release * refactor ut * refactor ut * refactor * refactor * refactor code style * refactor code style * refactor code style * refactor code style * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * add ProcessUtils UT * refactor code style * refactor code style * refactor code style * refactor code style * [Draft][Merge][133-dev]133 merge dev (#4031) * [Feture-3327][ui]Add the function of re-uploading files in the resource center * [Feture-3327][ui]Add the function of re-uploading files in the resource center (#3394) * Before creating a workflow, clear the canvas * [Fix-3256][ui] herry pick commit from dev for Fix admin user info update error (#3306) * [Feture-3327][ui]Add the function of re-uploading files in the resource center Co-authored-by: wuchunfu <319355703@qq.com> * [Improvement-3327][api]support re-upload the resource file (#3395) * [Fix-3390][server]Running hive sql task need find the hdfs path correctly (#3396) * [Fix-3390][api]Running hive sql task need find the hdfs path correctly * [Fix-3390][api]Running hive sql task need find the hdfs path correctly * update soft version * hive UDF function to modify the background color * fix * fix bug: Fix master task dependency check bug * cancel spark task version check (#3406) Co-authored-by: Eights-Li <yelli.hl@gmail.com> * [Bug][ui]Fix front-end bug #3413 * [Feature][ambari_plugin]support one worker can belongs different worker groups when execute install script (#3410) * Optimize dag * Update actions.js (#3401) * [Fix-3256][ui] Fix admin user info update error (#3425) (#3428) * [PROPOSAL-3139] Datasource selection changes from radio to select * [PROPOSAL-3139] Datasource selection changes from radio to select * [BUG FIX] issues #3256 * [BUG FIX] issues #3256 * [BUG FIX] issues #3256 * [Fix-3256][ui] Fix admin user info update error * [Fix-3256][ui] Fix admin user info update error * [Fix-3256][ui] Fix admin user info update error * [Fix-3256][ui] Fix admin user info update error * reset createUser.vue * [Fix-3256][ui] Fix admin user info update error Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: wuchunfu <319355703@qq.com> Co-authored-by: dailidong <dailidong66@gmail.com> * [Fix-3433][api]Fixed that release the imported process definition which version is below 1.3.0 will be failure * dag connection add check * fix * [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x (#3454) * Remove node deep monitoring * If worker group id is null,don't need to set the value of the worker group (#3460) * [Fix-3423][dao][sql]Fixed that the resource file of the task node can't be found when upgrade from 1.2.0 to 1.3.x * [Fix-3423][dao]If worker group id is null,don't need to set the value of the worker group * [ui]Code optimization * fix * fix * [fix-3058][ui]Move rtTargetArr to jsPlumbHandle.js * [optimization][ui]Prevent the shell script input box from being empty * [Fix-3462][api]If login user is admin,need list all udfs (#3465) * [Fix-3462][api]If login user is admin,need list all udfs * [Fix-3462][api]add the test on the method of QueryUdfFuncList * [Fix-3462][api]fix the code smell * [Fix-3462][api]fix the code smell * [Fix-3462][api]fix the code smell * [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource (#3482) * [fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data * [Feture-3327][ui]Add the function of re-uploading files in the udf subdirectory * fix bug: Fix master task dependency check bug (#3473) Co-authored-by: lenboo <baoliang@analysys.com.cn> * [maven-release-plugin] prepare release 1.3.2 * [maven-release-plugin] prepare for next development iteration * fix ci_e2e fail (#3497) * [Fix-3469][api]Should filter the resource by the different program type (#3498) * [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource * [Fix-3469][api]Should list python file and jar file * [Fix-3469][api]Should filter the resource by the different program type * [Fix-3469][api]fix the code smell * test release 1.3.2 version rollback * test release 1.3.2 version rollback * test release 1.3.2 version rollback (#3499) * [Feature] JVM parameter optimization , related issue #3370 * [Feature] JVM parameter optimization , related issue #3370 * test release 1.3.2 version rollback * test release 1.3.2 version rollback Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * [maven-release-plugin] prepare release 1.3.2 * [maven-release-plugin] prepare for next development iteration * [Fix-3469][ui]The value of maintenance resources and the filtering of resources according to different program types * fix * Revert "fix ci_e2e fail (#3497)" This reverts commit e367f90bb7. * test * test release 1.3.2 version rollback * test release 1.3.2 version rollback (#3503) * [Feature] JVM parameter optimization , related issue #3370 * [Feature] JVM parameter optimization , related issue #3370 * test release 1.3.2 version rollback * test release 1.3.2 version rollback * test * test release 1.3.2 version rollback Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * [maven-release-plugin] prepare release 1.3.2 * [maven-release-plugin] prepare for next development iteration * test release 1.3.2 version rollback (#3504) * [Feature] JVM parameter optimization , related issue #3370 * [Feature] JVM parameter optimization , related issue #3370 * test release 1.3.2 version rollback * test release 1.3.2 version rollback * test * test release 1.3.2 version rollback Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * [maven-release-plugin] prepare release 1.3.2 * [maven-release-plugin] prepare for next development iteration * fix ds muti-level directory in zk, which lead to fail to assign work * add login user check some actions in api * [Hotfix][ci] Fix e2e ci docker image build error * modify tag 1.3.0 to HEAD * modify tag 1.3.0 to HEAD (#3525) * [Feature] JVM parameter optimization , related issue #3370 * [Feature] JVM parameter optimization , related issue #3370 * test release 1.3.2 version rollback * test release 1.3.2 version rollback * test * test release 1.3.2 version rollback * modify tag 1.3.0 to HEAD Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * remove OGNL part of the mybaits notice (#3526) * [maven-release-plugin] prepare release 1.3.2 * [maven-release-plugin] prepare for next development iteration * release 1.3.2 version rollback (#3527) * [Feature] JVM parameter optimization , related issue #3370 * [Feature] JVM parameter optimization , related issue #3370 * test release 1.3.2 version rollback * test release 1.3.2 version rollback * test * test release 1.3.2 version rollback * modify tag 1.3.0 to HEAD Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * [ui]Script input box to modify the delay loading time * fix * fix * fix * fix * modify general user can't create token * [ui]It is forbidden to select non-existent resources and modify the tree display data format * modify general user can't create token (#3533) * [Feature] JVM parameter optimization , related issue #3370 * [Feature] JVM parameter optimization , related issue #3370 * test release 1.3.2 version rollback * test release 1.3.2 version rollback * test * test release 1.3.2 version rollback * modify tag 1.3.0 to HEAD * modify general user can't create token Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * if task is null , set task type is null instead of "null" * [Fix-3536][api]If user didn't have tenant,create resource directory will NPE (#3537) * [Fix-3536][api]If user didn't have tenant,create resource will NPE * [Fix-3536][api]If user didn't have tenant,create resource directory will NPE * modify general user can't create,delete,update token (#3538) Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * [ui]Resource delete OK button to increase loading, change the number of homepage display cursor * fix * [Fix-3616][Server] when worker akc/response master exception , async retry (#3748) * [fixbug][ui]Repair the master and worker management instrument display * [Fix-3238][docker]Fix that can not create folder in docker with standalone mode (#3741) * [fixbug][ui]Remove non-existent or deleted resources disabled * [fixBug-3621][ui]If the workflow instance status is executing status, it is forbidden to select * [fix-3553][ui]Repair click workflow connection, select the entire path * fix * fix * [Fix-3238][docker]Fix that can not create folder in docker with standalone mode * [Fix-3616][Server] when worker akc/response master exception , async retry (#3776) * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected. * [Improvement-3720][ui] js mailbox verification fix * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3784) * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected. * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> Co-authored-by: zhuangchong <zhuangchong8@163.com> Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com> * [Fix-3124][docker]Fix that can not build a docker image on windows (#3765) * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3786) * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected. * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> Co-authored-by: zhuangchong <zhuangchong8@163.com> Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com> * [Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException (#3787) * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * [Fix-3616][Server] when worker akc/response master exception , async retry * The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected. * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect * [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect * [BugFixed] issue #3258 (#3265) * 'ExecutionStatus' * '3258' * Update WorkerGroupServiceTest.java * Delete UserState.java * Delete ResourceSyncService.java * Delete core-site.xml * Delete hdfs-site.xml Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> Co-authored-by: zhuangchong <zhuangchong8@163.com> Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com> Co-authored-by: dailidong <dailidong66@gmail.com> * [fixBug-3792][ui]Click on the sidebar to adapt the width of the pie chart on the project homepage * [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715) * fix bug Delete invalid field: executorcores Modify verification prompt * fix bug Delete invalid field: executorcores Modify verification prompt * fix bug Delete invalid field: executorcores Modify verification prompt * dag add close button * reset last version * reset last version * dag add close buttion dag add close buttion * update CLICK_SAVE_WORKFLOW_BUTTON xpath * updae CLICK_SAVE_WORKFLOW_BUTTON xpath * updae CLICK_SAVE_WORKFLOW_BUTTON xpath * updae CLICK_SAVE_WORKFLOW_BUTTON xpath * Update CreateWorkflowLocator.java modify submit workflow button * Update CreateWorkflowLocator.java * Update CreateWorkflowLocator.java modify CLICK_ADD_BUTTON * Update CreateWorkflowLocator.java delete print * Update CreateWorkflowLocator.java 1 * Update CreateWorkflowLocator.java 1 * Setting '-XX:+DisableExplicitGC ' causes netty memory leaks in addition update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M' * Update dag.vue * Update dag.vue * Update dag.vue * Update CreateWorkflowLocator.java * Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks" This reverts commit 3a2cba7a * Setting '-XX:+DisableExplicitGC ' causes netty memory leaks in addition update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M' * Update dolphinscheduler-daemon.sh * catfile method Stream not closed * catfile method Stream not closed Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com> * [Fix-#3713][common]Fix that catfile method Stream not closed * [Fix-#3713][common]Fix that catfile method Stream not closed (#3810) * [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715) * fix bug Delete invalid field: executorcores Modify verification prompt * fix bug Delete invalid field: executorcores Modify verification prompt * fix bug Delete invalid field: executorcores Modify verification prompt * dag add close button * reset last version * reset last version * dag add close buttion dag add close buttion * update CLICK_SAVE_WORKFLOW_BUTTON xpath * updae CLICK_SAVE_WORKFLOW_BUTTON xpath * updae CLICK_SAVE_WORKFLOW_BUTTON xpath * updae CLICK_SAVE_WORKFLOW_BUTTON xpath * Update CreateWorkflowLocator.java modify submit workflow button * Update CreateWorkflowLocator.java * Update CreateWorkflowLocator.java modify CLICK_ADD_BUTTON * Update CreateWorkflowLocator.java delete print * Update CreateWorkflowLocator.java 1 * Update CreateWorkflowLocator.java 1 * Setting '-XX:+DisableExplicitGC ' causes netty memory leaks in addition update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M' * Update dag.vue * Update dag.vue * Update dag.vue * Update CreateWorkflowLocator.java * Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks" This reverts commit 3a2cba7a * Setting '-XX:+DisableExplicitGC ' causes netty memory leaks in addition update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M' * Update dolphinscheduler-daemon.sh * catfile method Stream not closed * catfile method Stream not closed Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com> * [Fix-#3713][common]Fix that catfile method Stream not closed Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com> Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com> * [Fix-#3487][api、dao] cherry pick from dev to fix that create folder duplicate name under multithreading * [Hotfix-3131][api] Fix the new tenant already exists prompt (#3132) * Bugfix: Fix the new tenant already exists prompt * Feature: Add test cases * Update TenantServiceTest.java Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> * Set up JDK 11 for SonarCloud in github action. (#3052) * Set up JDK 11 for SonarCloud in github action. * Fix javadoc error with JDK 11. * Prevent Javadoc from stopping if it finds any html errors. * [fixBug-3621][ui]Select the batch checkbox to unfilter the instances in the executing state * add verify tenant name cannot contain special characters. * [fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers * fix * fix * fix * [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it need replace the origin resource file. (#3862) * [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file. * [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file. * [fixbug-3621][ui]Workflow instance ready to stop and ready to suspend state prohibits checking * [fixbug-3887][ui]Fix missing English translation of re-upload files * add process define name verify. (#3879) * Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters." * revert pr 3872 * [FIX-3617][Service]after subtask fault tolerance, 2 task instances are generated (#3830) * fix bug(#3617): after subtask fault tolerance, 2 task instances are generated. * delete unused code * update code smell * refactor sub work command process * add process service ut * add license header * fix some code smell * chang ut java8 to java11 * update sonar to java11 * copy ut config from dev * remove checkstyle * revert to 1.3.3 * change proess service test to executor service * add process service test * add process service test * revert * revert * add comments * change dev to 1.3.3-release * revert Co-authored-by: baoliang <baoliang@analysys.com.cn> * [Fix-#3487][sql] add dolphinscheduler_dml.sql under 1.3.3_schema (#3907) * [FIX-3836][1.3.3-release-API] process definition validation name interface prompt information error (#3899) * fix bug : error message * fix code smell * fix code smell * [FIX_#3789][remote]cherry pick from dev to support netty heart beat * [FIX_#3789][remote]cherry pick from dev to support netty heart beat * [FIX_#3789][remote]cherry pick from dev to support netty heart beat (#3913) * [FIX_#3789][remote]cherry pick from dev to support netty heart beat * [FIX_#3789][remote]cherry pick from dev to support netty heart beat Co-authored-by: Kirs <acm_master@163.com> * Repair check box cannot be canceled * [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly * [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly * [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly (#3918) * [FIX_#3789][remote]cherry pick from dev to support netty heart beat * [FIX_#3789][remote]cherry pick from dev to support netty heart beat * [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly * [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly Co-authored-by: Kirs <acm_master@163.com> * [Fix-#3487][sql] update uc_dolphin_T_t_ds_resources_un * Workflow definition name re-modified and added check * [fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly. * update code. * [#3931][ui]Field name optimization for spark, flink, and mr * change version from 1.3.2-SNAPSHOT to 1.3.3-SNAPSHOT (#3934) * [maven-release-plugin] prepare release 1.3.3 * [maven-release-plugin] prepare for next development iteration * [ambari-plugin]change version 1.3.2 to 1.3.3 (#3935) * fix bug:3615 After the task is executed successfully, but the next task has not been submitted, stop the master * [fixBug-3964][ui]Switch back and forth over timeout alarm, the selected value is empty * solve too many files, close logClientService (#3971) * fix #3966 sub process doesnot send alert mail after process instance ending. (#3972) Co-authored-by: baoliang <baoliang@analysys.com.cn> * [Fix-#3618][server] resolve task executed finished but not release the file handle (#3975) * [Fix-#3618][server] resolve task executed finished but not release the file handle * [Fix-#3618][server] resolve task executed finished but not release the file handle * [Fix-#3958][api] files should not be created successfully in the directory of the authorized file * [FIX-3966] The timeout warning does not take effect in sub_process (#3982) * fix #3966 sub process doesnot send alert mail after process instance ending. * fix bug 3964: sub_process The timeout warning does not take effect add timeout warning for sub_process/dependent task. * fix code smell * fix code smell * fix code smell * update worker group inherit from parent Co-authored-by: baoliang <baoliang@analysys.com.cn> * fix import dolphinscheduler_mysql.sql insert admin user data * [FIX-3929] condition task would post wrong tasks when failover. (#3999) * fix #3966 sub process doesnot send alert mail after process instance ending. * fix bug 3964: sub_process The timeout warning does not take effect add timeout warning for sub_process/dependent task. * fix code smell * fix code smell * fix code smell * update worker group inherit from parent * remove stdout in logback configuration * fix bug #3929 condition task would post error when failover. * remove unused test * add comments * add skip node judge Co-authored-by: baoliang <baoliang@analysys.com.cn> * [FIX-3929] because of no lock, start up failover would dispatch two same tasks. (#4004) * fix #3966 sub process doesnot send alert mail after process instance ending. * fix bug 3964: sub_process The timeout warning does not take effect add timeout warning for sub_process/dependent task. * fix code smell * fix code smell * fix code smell * update worker group inherit from parent * remove stdout in logback configuration * fix bug #3929 condition task would post error when failover. * remove unused test * add comments * add skip node judge * fix bug 3929: because of no lock, start up failover would dispatch two same tasks. Co-authored-by: baoliang <baoliang@analysys.com.cn> * revert pom version to 1.3.3-release * [maven-release-plugin] prepare release 1.3.3 * [maven-release-plugin] prepare for next development iteration * [release]revert pom version to 1.3.3-release * fix bug 4010: remove failed condition tasks from error-task-list. (#4011) Co-authored-by: baoliang <baoliang@analysys.com.cn> * [maven-release-plugin] prepare release 1.3.3 * [maven-release-plugin] prepare for next development iteration * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * refactor code style * refactor code style * refactor code style * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * refactor ut test * refactor ut test * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * refactor ut * merge from 1.3.3-release * refactor ut * refactor ut * refactor * refactor * refactor code style * refactor code style * refactor code style * refactor code style * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * merge from 1.3.3-release * refactor code style Co-authored-by: break60 <790061044@qq.com> Co-authored-by: wuchunfu <319355703@qq.com> Co-authored-by: lgcareer <18610854716@163.com> Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com> Co-authored-by: lenboo <baoliang@analysys.com.cn> Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> Co-authored-by: Yelli <amarantine@my.com> Co-authored-by: Eights-Li <yelli.hl@gmail.com> Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com> Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> Co-authored-by: XiaotaoYi <v-xiayi@hotmail.com> Co-authored-by: Yichao Yang <1048262223@qq.com> Co-authored-by: zhuangchong <zhuangchong8@163.com> Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com> Co-authored-by: muzhongjiang <mu_zhongjiang@163.com> Co-authored-by: Jave-Chen <baicai.chen@gmail.com> Co-authored-by: zhuangchong <zhuangchong6@163.com> Co-authored-by: zhuangchong <37063904+zhuangchong@users.noreply.github.com> Co-authored-by: Kirs <acm_master@163.com> Co-authored-by: lgcareer <lgcareer@apache.org> Co-authored-by: wulingqi <wulingqi@baijiahulian.com> * Revert "[Draft][Merge][133-dev]133 merge dev (#4031)" (#4057) This reverts commit ad2d9f99d0. * [Fix][API] Condition task null pointer exception (#4056) * add ProcessUtils UT * modify ProcessUtils & ProcessUtilsTest * Enhance user experience, add close button, return to the previous page (#4006) Co-authored-by: zhanglong <zhanglong@ysstech.com> * [FIX_BUG][server-test] dismiss of server warm-up time in RoundRobinSelectorTest (#4067) * [Fix][api] Fix build parameter error of sqlserver when create. (#4015) * [fix-#3962][api] Avoid ClassCastException for LoggerService.queryLog(). * [Fix][api] Fix build parameter error of sqlserver when create. * [Feature-3985][Datax] Datax supports setting up running memory (#3986) * Datax supports setting up running memory * Datax supports setting up running memory * Datax supports setting up running memory * When running a task, the resource file is lost, which results in an error * add unit test * add unit test * add unit test * add test unit * add test unit * add test unit * fix code smell * add test unit * add test unit * [Improvement-3767][api] Task instance supports query by process instance name (#3825) * Task instance supports query by process instance name. * add test code checkstyle. * add test param. * resolve the sonar duplication check. * solve logger single-line string exceeds 200 characters. * resolve the sonar check. * Resolve code conflicts. Co-authored-by: zhuangchong <zhuangchong8@163.com> * deal with magic value * [Feature-4050][server] Spark task support udv inject (#4061) * #4050 spark task support udv inject * modify spark task UT * modify sparkTaskExecutionCtx * add exp for spark task get main jar method * deal with magic value * [Improvement-3471][common] JSONUtils.toMap It is not necessary to check whether the JSON method is empty again. #3471 (#3481) * JSONUtils.toMap call improvement. * [Fix-4054][Api] Fix The last week of the month for adding/editing timing, preview and save timing will report an error * 解决单独执行子节点空指针的问题 * using OSUtils.execCmd when kill yarn app * 解决单独执行子节点空指针的问题(增加checkstyle) * 解决单独执行子节点空指针的问题(增加checkstyle) * [FIX-#4083][server]fix taskInstance state change error Concurrent processing of ack message and result message causes the execution sequence to be wrong # this close # 4083 * code style * fix replaceNRTtoUnderline NullPointerException #4098 (#4100) * fix replaceNRTtoUnderline NullPointerException * add unit Test * add taskResponseTest * add taskResponseTest * code smell * Time is too small and the task is not finished * Time is too small and the task is not finished * [FIX-4034][server] fix sqoop import fail (#4036) * fix #4043, sqoop import query fail * fix #4043, sqoop task hard code & code style * add license for SqoopConstants * add private constructor for SqoopConstants * fixed sqoop mysql pwd have special character * fix checkstyle * fix sqoop task log * remove unused constants * Time is too small and the task is not finished * Time is too small and the task is not finished * test * remove assert * test * test * fix task instance status judgment error * fix: security page disappear delay problem when force refresh under GENERAL_USER * improvement: resovle download url with resolveURL to prevent change of apiPrefix * fix sqoop task jdbc string contains special char (#4105) * [Bug][Common] read file garbled (#3479) * fix bug : Random code problem Co-authored-by: zhanglong <zhanglong@ysstech.com> * [Improvement-3933][db operation] Improve the performance of sql query (#3940) * optimize select * case * emove redundancy * bug fixed * Update en_US.js * Update startup.sh * optimize * optimize code * optimize * bug fixed * add ut * bug fixed * bug fixed * bug fixed * bug fixed * Delete WorkFlowLineageMapper.xml * Delete createTenement.vue * recove wrongly deleted file * Update WorkFlowLineageMapper.xml * Update createTenement.vue * [Feature][API]enable response resources gzip compression (#4121) * enable response compression * add server.compression.mime-types with default value explicitly * [Improvement][API] ignore noNodeException when get worker groups (#4120) * ignore noNodeException when get worker groups * add ut * [Improvement][Code style] FIX SPELL WAITTING TO WAITING , etc. (#4118) * FIX SPELL * FIX SPELL AND Optimizing code conventions * add ut cannot construct process instance, return null; * add ut testExportProcessMetaData * add ut testExportProcessMetaData * add ut testImportProcessSchedule * add ut MasterExecThreadTest * add ut MasterExecThreadTest * add ut testSubProcessViewTree * add ut testComplementWithStartNodeList * add ut testRecurseFindSubProcessId * add ut testRecurseFindSubProcessId * add ut testRecurseFindSubProcessId * [FIX#4033] $[] conflicts with mysql keywords (#4111) * [FIX#4033] $[] conflicts with mysql keywords We currently only use this symbol for dates, so I filtered out the number type. this close #4033 * test * fix error * split sqoop import hive database and table (#4141) * upgrade quartz version to 2.3.0 * add HikariCP-java6,c3p0,mchange-commons-java license * upgrade jackson version to 2.9.10 * remove c3p0,mchange-commons-java license * update Check code style * update code style * Update pom.xml * Update pom.xml * Update LICENSE not need to add HikariCP-java6 * Delete LICENSE-HikariCP-java6.txt * Update known-dependencies.txt * Update TaskInstanceMapper.xml optimize page of [TaskInstance] load data slow * [FIX-PR-4097][server-master]task ack miss (#4189) When the message of successful execution arrives earlier than the message of ack, the message of ack will be discarded, resulting in some information missing * fix bug #4125 (#4127) * fix bug #4125 * code style! * code style. Co-authored-by: chengp <chengp@chengp.net> * [FIX-4190][DAO] When the amount of json data is large, the process list page display slowly. (#4201) * fix 4190: When the amount of json data is large, process list page display slowly * fix 4190: When the amount of json data is large, process list page display slowly * fix 4190: When the amount of json data is large, process list page display slowly Co-authored-by: baoliang <baoliang@analysys.com.cn> * [Fix-3457][flink] fix flink args build problem (#4166) * [Fix][Flink] fix flink args build problem * [Fix][Flink] fix FlinkArgsUtilsTest * [Improvement][UI] hide version and cluster input when deployMode is local * [common]del windows file( not support windows ) (#4204) * del support win * del support win * [Feature-4138][Master] dispatch workgroup error add sleep time (#4139) * When there are tasks with assignment failure and the number of tasks in the current task queue is less than 10, sleep for 1 second * When there are tasks with assignment failure and the number of tasks in the current task queue is less than 10, sleep for 1 second * fix code smell & code style * fix code smell & code style Co-authored-by: zhanglong <zhanglong@ysstech.com> * [FIX-#4172][server-worker] kill task NPE (#4182) * [FIX-#4172][server-worker] kill task NPE The cache task will be sent when the Process is generated. Before that, if a kill task appears, then NPE will appear Modification method: write into the cache when the task is received, and mark it as preData If the task is killed before the Process is generated, delete the cache directly at this time It will be judged before the process is generated. If the task has been killed, it will not be executed. After the new process is created, write it into the cache, and judge again, if kill, then kill the process. this closes #4172 * Delete the commented out code Add spring beans * code smell * add test * add test * fix error * test * test * revert * fix error * [Feature-3878]Replace the page with element-ui (#4065) * [Feature-3878]Introduce elment-ui and replace the security center module page with elment-ui * Change node version * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * Replace the page with element-ui * Replace user management with elment-ui * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * Repair the last Sunday of each month * support auto eslint for .js, .vue file on save * update .eslintrc.yml and license check exclude .eslintignore * fix eslint: fix syntax by npm run lint automatically * fix eslint: fatal syntax errors * fix eslint: expected '!==' but instead saw '!=', expected '===' but instead saw '==' * fix eslint: Unexpected side effect in 'cacheParams' computed property * fix eslint: assigned a value but never used * fix eslint: component has been registered but not used * fix eslint: unexpected mutation of prop * fix bug: start from the setting nodes with NODE_PRE would be NPE. (#4219) * deleted invalid code as assigned in issue 4215 (#4221) deleted the code at following two places: org.apache.dolphinscheduler.service.process.ProcessService#checkTaskExistsInTaskQueue org.apache.dolphinscheduler.service.process.ProcessService#taskZkInfo * [FIX-#3177]Task time parameter parsing error (#4224) * [FIX-#3177]Task time parameter parsing error rerun schedule time error this closes #3177 * [FIX-#3177]Task time parameter parsing error rerun schedule time error this closes #3177 * fix sql error (#4227) * [FIX-3177]Task time parameter parsing error (#4228) * [FIX-3177]Task time parameter parsing error when system.datetime !=null $[datetime] = system.datetime else $[datetime] = current time * remove unused import * fix date_convert null * fix time cover * fix time cover * reformat * add ut * [Fix][UI]: fix re-login problem in new tab and state synchronization problem in multiple tabs (#4162) * fix(ui): re-login problem in new tab * refresh page in new tab automatically * support to reload router view in lightweight * optimize visibility code * [Improvement][UI] Add no-var rule for eslint and add 'npm run lint:fix' command (#4225) Add no-var rule for eslint, and fix related files Add npm run lint:fix command, which distinguished from the default command npm run lint The behavior of command npm run lint and command npm run lint:fix should be distinguished The first command is used to lint only, and the second one is used to lint and fix problems automatically * [FIX][UI ] security user state tenantCode User Type Display abnormal (#4255) * fix user state error * fix userType error * fix tenantCode error * [Fix-4222][Master]Add the priority queue to ensure that tasks are submitted according to priority. (#4250) * [Fix-4222][Master]Add the priority queue to ensure that tasks are submitted according to priority. * [Fix-4222][Master]Add the priority queue to ensure that tasks are submitted according to priority. * [Fix-4222][Master]Remove useless import * [Fix-4222][Master]Reformat code style * [Fix-4222][Master]Reformat code style * [Fix-4222][Master]Reformat code style * [Fix-4222][Master]add PeerTaskInstancePriorityQueueTest * [Fix-4222][Master]Fix code smell * [Fix-4222][Master]Reformat code style * [Fix-4222][Master]Fix code smell Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com> * update bug template (#4260) * [Improvement-4069][server] When the tenant does not exist, the task execution should throw an exception (#4108) * when the tenant does not exist, the task execution should throw an exception * remote method createWorkDirAndUserIfAbsent * set the task status failed when the tenant code does not exist. * add taskLog. * update check os user exists * update TaskExecuteThreadTest test method. * solving sonar fail. * remove AbstractTask.getCurTaskParamsClass()and replace with TaskParametersUtils.getParameters() (#4262) * remove getCurTaskParamsClass() in AbstractTask.java and replace it with TaskParametersUtils.getParameters() * remove unused imports in AbstractTask.java * reformat * [Fix-4271][server] Fix IOException or NoSuchFileException in logger server (#4272) * fix version funcation delete. (#4265) * [improvement][config] Update datasource.properties，add mysql meta data template (#4266) * Update datasource.properties [新增]元数据mysql连接模版 * Update datasource.properties Co-authored-by: dailidong <dailidong66@gmail.com> * fix taskInstance submitTime is empty. (#4274) * [Improvement-3878]Tenant list delete user name (#4278) * [Fix-4268] Fix NumberFormatException when visiting a doc.html or swagger-ui.html (#4269) * [Fix-4268] Fix NumberFormatException when visiting a doc.html or swagger-ui.html * Fix checkstyle error * Update swagger-models in known-dependencies.txt * [Improvement-3878][ui]Fix the list style (#4280) * [Improvement-3878]Tenant list delete user name * [Improvement-3878][ui]Fix the list style * [FIX] [UI] fix create project cancel button invalid (#4282) * fix create project cancel button invalid * [Improvement] Refactor code to support distributed tracing (#4270) * Refactor code to support tracing * Extension network protocol, support context and version * Extension master asynchronous queue support context * Extract scan task method from MasterSchedulerService for tracing * fix * fix * add test case * fix * fix Co-authored-by: hailin0 <hailin0@yeah.net> * [Improvement] Add Flink job name (#4285) * [Improvement] Add Flink job name * fix typo * [Improvement][ui]List vacancy optimization and icon icon repair (#4286) * [Improvement][ui] List vacancy optimization and icon icon repair * [FEATURE-736] integrate ldap authentication (#3743) * [FEATURE-736] integrate ldap authentication * add ldap authentication type * refactor authentication with ldap and password * add createUser for ldap in user service * remove duplicate password authenticator * [Fix-4289][*] Flink name with disappeared and unescaped problem (#4290) * fix flink name not display in process definition editor * fix flink name not escape problem * simplify escape method * fix database is the mysql DB keyword. (#4295) * fix the token management list does not display the user name. (#4302) * Dev imp server process utils (#4263) * Adds the comment on the WINDOWSATTERN Co-authored-by: Kirs <acm_master@163.com> Co-authored-by: 0002939 <licongyang@mininglamp.com> * fix version close function does not take effect. (#4307) * fix user management authorization operation exceptions do not prompt exception information. (#4292) * [Fix][UI] Fix ui style problem and refactor form style (#4329) * rename from-model to form-model * [UI] remove duplicated css style code * [UI] refactor css style of form model * fix form model overflow problem in ie * Align each item one by one in locale * fix el-dialog width is too wide * fix locale * [Improvement][UI] Improve script box and dialog css style (#4331) * [Fix-4335][UI] Fix IE 9-11 not supported * [FIx-4338][UI] Fix invalid date problem in IE * [Improvement] Use environment variable $DOLPHINSCHEDULE_OPTS as daemon startup arguments (#4341) Co-authored-by: hailin0 <hailin0@yeah.net> * [Fix][common] only two yarns can be selected(#4314) (#4344) * Handling conflicts manually * code style * ut skip ui * fix ut error * fix ut error * delete SchedulerController Unused field * delete SchedulerController Unused field * delete SchedulerController Unused field * ci skip ui * ignore AlertPluginManagerTest.java and DolphinPluginLoaderTest.java * fix ut error * fix ut error * test * code style * replace ui * replace ui * replace ui * replace ui * fix license * fix license Co-authored-by: 小清 <62982788+597365581@users.noreply.github.com> Co-authored-by: zhuangchong <37063904+zhuangchong@users.noreply.github.com> Co-authored-by: spring-bu <37682426+spring-bu@users.noreply.github.com> Co-authored-by: dailidong <dailidong66@gmail.com> Co-authored-by: lgcareer <18610854716@163.com> Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com> Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com> Co-authored-by: baoliang <baoliang@analysys.com.cn> Co-authored-by: BoYiZhang <zhangboyi_mx@163.com> Co-authored-by: zixi0825 <649790970@qq.com> Co-authored-by: sunchaohe <sunzhaohe@linklogis.com> Co-authored-by: break60 <790061044@qq.com> Co-authored-by: bao liang <29528966+lenboo@users.noreply.github.com> Co-authored-by: t1mon <178317391@qq.com> Co-authored-by: zhanglong <zhanglong@ysstech.com> Co-authored-by: 孙继峰 <sun.jifeng@outlook.com> Co-authored-by: wulingqi <wulingqi@baijiahulian.com> Co-authored-by: lgcareer <lgcareer@apache.org> Co-authored-by: IamMujuziMoses <49279842+IamMujuziMoses@users.noreply.github.com> Co-authored-by: huzekang <1040080742@qq.com> Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com> Co-authored-by: Eights-LI <yelli.eights@gmail.com> Co-authored-by: wuchunfu <319355703@qq.com> Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> Co-authored-by: Yelli <amarantine@my.com> Co-authored-by: Eights-Li <yelli.hl@gmail.com> Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> Co-authored-by: XiaotaoYi <v-xiayi@hotmail.com> Co-authored-by: Yichao Yang <1048262223@qq.com> Co-authored-by: zhuangchong <zhuangchong8@163.com> Co-authored-by: muzhongjiang <mu_zhongjiang@163.com> Co-authored-by: Jave-Chen <baicai.chen@gmail.com> Co-authored-by: zhuangchong <zhuangchong6@163.com> Co-authored-by: hailin0 <hailin0@yeah.net> Co-authored-by: yangquan <iyeeku@qq.com> Co-authored-by: liliang1991 <liliang_68@126.com> Co-authored-by: liang.li.c <liang.li.c@17zuoye.com> Co-authored-by: felix.wang <59079269+felix-thinkingdata@users.noreply.github.com> Co-authored-by: chengshiwen <chengshiwen0103@gmail.com> Co-authored-by: Yarlung <turingdojo@163.com> Co-authored-by: karlsun <karlsun@tencent.com> Co-authored-by: wangxj3 <857234426@qq.com> Co-authored-by: chengp <5058557@qq.com> Co-authored-by: chengp <chengp@chengp.net> Co-authored-by: Saksham Gupta <saksham1319@gmail.com> Co-authored-by: Tq <36755957+Tianqi-Dotes@users.noreply.github.com> Co-authored-by: Jatham <59549328+Jatham922@users.noreply.github.com> Co-authored-by: hailin0 <hailin0@foxmail.com> Co-authored-by: zh0122 <zh0122@gmail.com> Co-authored-by: geosmart <geosmart@hotmail.com> Co-authored-by: 李丛阳 <liby-1987@163.com> Co-authored-by: 0002939 <licongyang@mininglamp.com> Co-authored-by: kamisamak <1057372918@qq.com>	4 years ago
dailidong	64dd9dbb53	update bug template (#4260)	4 years ago
break60	e033f81e9d	[Feature-3878]Replace the page with element-ui (#4065) ... * [Feature-3878]Introduce elment-ui and replace the security center module page with elment-ui * Change node version * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * Replace the page with element-ui * Replace user management with elment-ui * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * Repair the last Sunday of each month	4 years ago
bao liang	f29f4e8384	[FIX-3617][Service]after subtask fault tolerance, 2 task instances are generated (#3830) ... * fix bug(#3617): after subtask fault tolerance, 2 task instances are generated. * delete unused code * update code smell * refactor sub work command process * add process service ut * add license header * fix some code smell * chang ut java8 to java11 * update sonar to java11 * copy ut config from dev * remove checkstyle * revert to 1.3.3 * change proess service test to executor service * add process service test * add process service test * revert * revert * add comments * change dev to 1.3.3-release * revert Co-authored-by: baoliang <baoliang@analysys.com.cn>	4 years ago
Jave-Chen	a51dafc382	Set up JDK 11 for SonarCloud in github action. (#3052) ... * Set up JDK 11 for SonarCloud in github action. * Fix javadoc error with JDK 11. * Prevent Javadoc from stopping if it finds any html errors.	4 years ago
qiaozhanwei	29f1123d1d	[Fix-3616][Server] when worker akc/response master exception , async retry (#3748)	4 years ago
felix.wang	4ed3638750	[Bug][server] fix 3629 pull request (#3706) ... * fix 3629 pr * fix e2e build	4 years ago
xingchun-chen	5888095502	[test][e2e]add timing testcase and modify chromeDriver (#3597) ... * Add task connection  * Optimize test cases   * Modify variable format     * Optimize test cases   * Update BrowserCommon.java * Update BrowserCommon.java * Update WorkflowDefineLocator.java * Optimize waiting time   * Optimize wait time   * Optimize wait time   * Optimize wait time   * Optimize wait time   * Optimize wait time   * Optimize wait time   * Optimize wait time   * Optimize wait time   * Optimize wait time   * Optimize project wait time   * Optimize wait time   * Optimize wait time   * open timing testcase  * Optimize wait time   * Optimize wait time   * Optimize wait time   * Optimize wait time   * Optimize wait time   * Optimize wait time   Co-authored-by: chenxingchun <438044805@qq.com>	4 years ago
xingchun-chen	2e175ff3da	Update ci_e2e.yml	4 years ago
xingchun-chen	f921fde1dd	Update ci_e2e.yml	4 years ago
xingchun-chen	8d18795555	Update ci_e2e.yml	4 years ago
break60	35d1372d01	fix	4 years ago
Jave-Chen	42b0d67cef	add checkstyle job in github action. (#3518)	4 years ago
lgcareer	545beae491	Revert "fix ci_e2e fail (#3497)" ... This reverts commit e367f90bb7.	4 years ago
lgcareer	e367f90bb7	fix ci_e2e fail (#3497)	4 years ago
Yichao Yang	8ba3620710	[Improvement] Add the issue specifications reference (#3221)	4 years ago
xingchun-chen	e97b4707a5	[Test-2995][e2e] run workflow and timing testCase (#3201) ... * 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 * modify dataX environment variable * update e2e chrome version * add alert manage testcase and Optimize test case execution order * add e2e to create and to edit queue * update e2e chrome version * add e2e token testcase * add e2e token testcase * add e2e to run workflow testcase * add e2e timing testcase * add e2e timing testcase * add e2e timing testcase * add e2e timing testcase * Merge remote-tracking branch 'upstream/dev' into dev # Conflicts: # e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java # e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java * Merge remote-tracking branch 'upstream/dev' into dev # Conflicts: # e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java # e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java * Merge remote-tracking branch 'upstream/dev' into dev # Conflicts: # e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java # e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java * Merge remote-tracking branch 'upstream/dev' into dev # Conflicts: # e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java # e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java * Merge remote-tracking branch 'upstream/dev' into dev # Conflicts: # e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java # e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java * Merge remote-tracking branch 'upstream/dev' into dev # Conflicts: # e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java # e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java * Merge remote-tracking branch 'upstream/dev' into dev # Conflicts: # e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java # e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java * Merge remote-tracking branch 'upstream/dev' into dev # Conflicts: # e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java # e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java * Merge remote-tracking branch 'upstream/dev' into dev # Conflicts: # e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java # e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java * Merge remote-tracking branch 'upstream/dev' into dev # Conflicts: # e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java # e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java * Merge remote-tracking branch 'upstream/dev' into dev # Conflicts: # e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java # e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java * Merge remote-tracking branch 'upstream/dev' into dev # Conflicts: # e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java # e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java * Merge remote-tracking branch 'upstream/dev' into dev # Conflicts: # e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java # e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java * edit user * edit user * edit user * edit user * edit user * Update TimingLocator.java * modify ci log * Update ci_e2e.yml modify ci logs * Update ci_e2e.yml modify ci logs * Update ci_e2e.yml modify ci logs * Update ci_e2e.yml * Update ci_e2e.yml modify ci logs * Update ci_e2e.yml modify ci logs * Update ci_e2e.yml modify ci logs * Update ci_e2e.yml modify ci logs * Update ci_e2e.yml modify artifact version * Update ci_e2e.yml * Update ci_e2e.yml modify /var/lib/docker/volumes permissions * Update ci_e2e.yml modify ci logs * Update ci_e2e.yml Modify log file permissions * Update ci_e2e.yml modify logs * Update ci_e2e.yml modify logs * Update ci_e2e.yml modify logs * modify ci logs * modify ci logs * modify ci logs * modify ci logs * Update ci_e2e.yml modify ci logs * modify ci logs * modify ci logs * modify ci logs * modify ci logs * modify ci logs * modify ci logs * modify ci logs * Update ci_e2e.yml modify ci logs * modify ci logs * modify ci logs * modify ci logs * modify ci logs * modify ci logs * modify ci logs * modify ci logs * modify ci logs * modify ci logs * modify ci logs * modify tenant * modify alert wait time * modify queue wait time * modify alert wait time * modify alert wait time * modify alert wait time * modify alert wait time * modify alert wait time * modify alert wait time * modify button xpath * modify queue xpath * Ignore edit user * modify alert wait time * print delete user log * modify the xpath of delete user button * modify timing wait time Co-authored-by: chenxingchun <438044805@qq.com> Co-authored-by: dailidong <dailidong66@gmail.com>	4 years ago
Yichao Yang	aea702e3d4	[Feature][docs] Add the issue template according to the issue specification (#3185) ... Co-authored-by: dailidong <dailidong66@gmail.com>	4 years ago
lgcareer	32b0dfd471	update ci from dev-1.3.0 (#3100)	4 years ago
bao liang	5bac559d22	Revert "branch dev merge from dev-1.3.0 (#3087)" (#3094) ... This reverts commit ab6e4310b4. Co-authored-by: dailidong <dailidong66@gmail.com>	4 years ago
dailidong	ab6e4310b4	branch dev merge from dev-1.3.0 (#3087) ... * add DolphinScheduler slack channel * Update README.md Co-Authored-By: Jiajie Zhong <zhongjiajie955@hotmail.com> * modify soft_version 1.2.2 to 1.3.0 * Repair worklist cannot be deleted * update schema version (#2657) * change schema version from 1.2.2 to 1.3.0 * change version value of table t_ds_version from 2.0.0 to 1.3.0 * fix bug: sub worker flow in complement data would run start date (#2581) (#2656) Co-authored-by: baoliang <baoliang@analysys.com.cn> * Fix conditions node save exception * add unique key for t_ds_process_definition * add unique key for t_ds_process_definition * script variable has "processDefinitionId" is error #2664 (#2666) Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * update filename * Update dolphinscheduler_ddl.sql * Delete dolphinscheduler_ddl.sql * Delete dolphinscheduler_ddl.sql * add unique key for t_ds_process_definition add unique key for t_ds_process_definition * add unique key for t_ds_process_definition add unique key for t_ds_process_definition * Modify the alert log file   * blank in eamil and left font align #2648 (#2673) * script variable has "processDefinitionId" is error #2664 * blank in eamil and left font align #2648 Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * fix zookeeper health check and merge volumes into logs volume (#2674) * fix zookeeper health check and merge volumes into logs volume 1. Fix zookeeper health check 2. Merge volumes into logs volume 3. Modify `dockerfile/hooks/build` script * Modify ci_e2e and docker image registry * Modify ci_e2e * Modify ci_e2e * Modify ci_e2e and move ./dockerfile/hooks/check to ./docker/docker-swarm/ * migrate docker composer and move dockerfile dir to docker/build * ut docker * alter dockerfile to docker/build dir * delete docker-compose old * delete dockerfile zk * delete dockerfile zk * delete dockerfile zk * [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> * 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> * 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> * Update dolphinscheduler_ddl.sql * Using docker/docker-swarm/docker-compose.yml to run pg and zk in ci_ut.yml (#2692) * Using docker/docker-swarm/docker-compose.yml to run pg and zk in ci_ut.yml 1. add initdb volume for pg service in docker-compose.yml 2. modify ci_ut.yml * add sudo in ci_ut.yml * Query the metadata of indexes is not correct in postgresql/dolphinscheduler_ddl.sql 1. replace information_schema.STATISTICS to pg_stat_all_indexes 2. modify ProcessDefinitionMapperTest.java * Remove inner zk and pg * add inner pg * conditions The task node adds a background color to distinguish successful and failed connections * add LoggerServerTest UT (#2713) * add LoggerServerTest UT * add LoggerServerTest UT Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * 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> * fix worker group config no effect (#2719) * Conditional judgment adds text * fix * fix #2449:It's should successful to cancel authorize a resource of a user if all the online process definitions created by this user didn't use this resource. (#2725) * Underline the list of workflow operations * 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> * Modify ip configuration * set worker group (#2743) * simple config * fix worker group config no effect * fix #2598::allow to update resource suffix,but if it is authorized to other users,it is not allowed (#2732) * fix #2598:allow to update resource suffix,but if it is authorized to other users,it is not allowed. * add RESOURCE_IS_AUTHORIZED status * verify whether the suffix is empty * remove extra variables * fix code smell * Update known-dependencies.txt * update worker group config (#2746) * 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 * Update datasource.properties * remove codehaus janino jar (#2742) the license about janino maybe not compatiable with Apache v2 * [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> * Update known-dependencies.txt (#2748) * 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 * 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> * Fix rename check parameter * fix * fix 2598:change getId to getUserId (#2757) * fix #2598:allow to update resource suffix,but if it is authorized to other users,it is not allowed. * add RESOURCE_IS_AUTHORIZED status * verify whether the suffix is empty * remove extra variables * fix code smell * change getId to getUserId * Fix MySQL autoDeserialize bug (#2728) * Fix MySQL autoDeserialize bug * add MySQLDataSourceTest * Fix workflow definition history node data cannot be opened * fix * delete normalize * update e2e chrome version (#2775) Co-authored-by: chenxingchun <438044805@qq.com> * Modify the background color of conditions task node connection * [BUF FIX]fix: the master would be blocked when worker group not exists (#2764) * feature: add number configuration for master dispatch tasks * fix bug(#2762) the master would be blocked when worker group not exists * fix bug(#2762) the master would be blocked when worker group not exists * fix ut * fix ut Co-authored-by: baoliang <baoliang@analysys.com.cn> * [BUG FIX] fix bug: dependent task failed when conditions task exists (#2768) * fix bug 2464: change dependent task for process. * remove unused code * add ut * add ut * update comments Co-authored-by: baoliang <baoliang@analysys.com.cn> * Hourly dependency configuration， 'currentHour' and 'last24Hours' (#2696) * [feature] Add hourly dependency scenarios * [Feature] #2680 add DependentUtilsTest UT Co-authored-by: changqun.xu <changqun.xu@17zuoye.com> Co-authored-by: xuchangqun <changqun.x@gmail.com> * fix sql task bug #2739 (#2741) * Solve the failure to execute non-query sql * fix sql task bug Co-authored-by: sunchaohe <sunzhaohe@linklogis.com> Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> Co-authored-by: lgcareer <18610854716@163.com> * Worker group adds check * fix * Worker group adds check (#2787) * Worker group adds check * fix * add not worker log and remove worker invalid property (#2784) * 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 * add not worker log and remove worker invalid property Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * Modify the ambari-plugin readme for packing RPM packages and add a description of the replication plug-in directory (#2786) * fixed #2788 resolve the bug #2788 (#2789) * Modify the ambari-plugin readme for packing RPM packages and add a description of the replication plug-in directory * fixed #2788 * [BUG FIX] fix bug:cannot pause work flow when task state is "submit success" (#2783) * feature: add number configuration for master dispatch tasks * fix bug(#2762) the master would be blocked when worker group not exists * fix bug(#2762) the master would be blocked when worker group not exists * fix ut * fix ut * fix bug(2781): cannot pause work flow when task state is "submit success" * fix code smell * add mysql other param blank judge * test * update comments * update comments * add ut Co-authored-by: baoliang <baoliang@analysys.com.cn> * fix bug:#2735 (#2770) 1. store process id in zk. 2. resolve host and port through zk path. 3. modify ui key. * Modify startup parameter worker group value * Fix [Bug] process definition json worker group convert #2794 (#2795) * 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 * add not worker log and remove worker invalid property * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * [BUG FIX]fix bug: Restart the worker service again, the previously submitted successful tasks are not executed bug (#2800) * feature: add number configuration for master dispatch tasks * fix bug(#2762) the master would be blocked when worker group not exists * fix bug(#2762) the master would be blocked when worker group not exists * fix ut * fix ut * fix bug(2781): cannot pause work flow when task state is "submit success" * fix code smell * add mysql other param blank judge * test * update comments * update comments * add ut * fix bug: Restart the worker service again, the previously submitted successful tasks are not executed * update comments * add sleep Co-authored-by: baoliang <baoliang@analysys.com.cn> * delete unnecessary configuration items (#2803) * rename worker_group_id to worker_group and set the value of worker_group_name (#2801) * process definition json worker group convert #2794 (#2809) * 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 * add not worker log and remove worker invalid property * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * compatible old version host not port delete log file (#2811) * 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 * add not worker log and remove worker invalid property * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * process definition json worker group convert #2794 * compatible old version host not port delete log file Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> * Added instructions for ambari to add and remove Dolphin Schdumer components on nodes (#2806) * delete unnecessary configuration items * Added instructions for ambari to add and remove Dolphin Schdumer components on nodes * Added instructions for ambari to add and remove Dolphin Schdumer components on nodes * fix oracle connect failure (#2812) * use method getJdbcUrl of parent * Remove the incorrect print message * Modify process group workerGroup value display and filter child node duplicate values * Repair process definition bulk delete function * when init workflow, the tenantId linked by the tenantId of user * dag download does not refresh, modify the task instance operation width value * fix * [bug fix]fix bug: After the master is fault-tolerant, it cannot resume operation (#2813) * feature: add number configuration for master dispatch tasks * fix bug(#2762) the master would be blocked when worker group not exists * fix bug(#2762) the master would be blocked when worker group not exists * fix ut * fix ut * fix bug(2781): cannot pause work flow when task state is "submit success" * fix code smell * add mysql other param blank judge * test * update comments * update comments * add ut * fix bug: Restart the worker service again, the previously submitted successful tasks are not executed * update comments * add sleep * add null point check * fix bug:After the master is fault-tolerant, it cannot resume operation * fix bug: do not failover the host is 'NULL' process Co-authored-by: baoliang <baoliang@analysys.com.cn> * When update the data source,the host and port show error (#2821) * When update the data source,the host and port show error * update DataSourceServiceTest * update DataSourceServiceTest * update DataSourceServiceTest * Fix ORACLE service name value display * Add tips for download workflow * fix * [bug fix] fix: The workflow is fault-tolerant and 2 task instances are generated (#2833) * feature: add number configuration for master dispatch tasks * fix bug(#2762) the master would be blocked when worker group not exists * fix bug(#2762) the master would be blocked when worker group not exists * fix ut * fix ut * fix bug(2781): cannot pause work flow when task state is "submit success" * fix code smell * add mysql other param blank judge * test * update comments * update comments * add ut * fix bug: Restart the worker service again, the previously submitted successful tasks are not executed * update comments * add sleep * add null point check * fix bug:After the master is fault-tolerant, it cannot resume operation * fix bug: do not failover the host is 'NULL' process * fix bug:worker failover error. Co-authored-by: baoliang <baoliang@analysys.com.cn> * add maven Xmx to 5g * fix bug: send task result to master until success. (#2839) * fix bug: send task result to master until success. * fix bug: send task result to master until success. * add sleep * set null if send result failed * set null if send result failed Co-authored-by: baoliang <baoliang@analysys.com.cn> * Fix errors when running on win10 (#2842) 1. DS cant run bat script 2. DS cant run python script 3. DS cant run datax script * Fix abnormal display of regular worker parameters * add source license full text into source license (#2840) * add source license full text into source license * exclude ScriptRunner.java on rat check * fix table not exist when init db metadata (#2838) * fix table not exist when init db metadata * fix db init error * fix ds-1.3.0 init db * init db modify process instance json Co-authored-by: eights <yelli.hl@foxmail.com> * change notice copyright date from 2019 to 2019-2020 (#2847) * add source license full text into source license * exclude ScriptRunner.java on rat check * change notice copyright date from 2019 to 2019-2020 * fix [BUG] TaskExecutionContextCacheManagerImpl Do not execute removeByTaskInstanceId #2745 (#2754) * mr resource display and create user username length cannot be less than 3 * fix * fix * fix * fix table T_DS_ALERT (#2854) * 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 * remove param monitor server state * fix table T_DS_ALERT * fix * fix * modify t_ds_task_instance app_link change sql (#2861) * change max length of user name to 39 (#2856) * fix bug: send task result to master until success. * fix bug: send task result to master until success. * add sleep * set null if send result failed * set null if send result failed * change max length of username to 39 Co-authored-by: baoliang <baoliang@analysys.com.cn> * copy resources need get top directory first (#2866) * copy resources need get top directory first * copy resources need get top directory first * fix #2860:copy files and create empty directory (#2876) * copy resources need get top directory first * copy resources need get top directory first * fix #2860:copy files and create empty directory * Fix bug:If user didn't set the value of tenant,release process definition fail (#2885) * copy resources need get top directory first * copy resources need get top directory first * fix #2860:copy files and create empty directory * Fix bug:If user didn't set the value of tenant,release process definition online fail * merge method updateuser if and fix bug#2892 fix [BUG] When editing user information, clear the phone number, the database table t_ds_user.phone is not cleared #2892 * fix bug: sqoop mysql import params error (#2896) * fix bug: sqoop mysql import params error * fix bug: sqoop mysql import params error * Fixed selection of tenant value and defalut changed to lower case * update how to build and remove docs link (#2906) * Fix tasks not execute in sub-process when rerun scheduled process. #2903 (#2908) * fix create table sql exception (#2912) fix create table sql exception * fix #2910 master server will show exception for some time when it restart (#2913) * 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 * remove param monitor server state * fix table T_DS_ALERT * update h2 database * fix #2910 master server will show exception for some time when it restart * Fixbug datax task (#2909) * fix: local param bug * fix: UT bug Co-authored-by: Rubik-W <whm_777@163.com> * [license] add license and notice (#2916) * fix bug: send task result to master until success. * fix bug: send task result to master until success. * add sleep * set null if send result failed * set null if send result failed * change max length of username to 39 * test for gc * change version to 1.3.0 * check and add some license files * check and add some license files * revert Co-authored-by: baoliang <baoliang@analysys.com.cn> * fix oom when no master is active in dev-1.3.0 (#2918) * 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 * remove param monitor server state * fix table T_DS_ALERT * update h2 database * fix #2910 master server will show exception for some time when it restart * fix oom when no master is active * fix worker oom when master server restart * fix oom * fix * add UT * fix worker group config no effect * Python, sql, sqoop,datax task node editor adds zoom function #2929 (#2933) * Python, sql, sqoop task node editor adds zoom function * fix * change 1.3.0 to 1.3.0-snapshot * add janino-3.0.12.jar * delete duplicate codes * add commons-compiler-3.0.12.jar * change delete status according to delete action result * Delete the pom files animation.scss, _normalize.scss and _animation.scss under the common folder * Change email to default (#2981) * add mybatis-3 notice in the top-level notice (#3003) * fix download resource file that under the directory error (#3007) * add mybatis-3 notice in the top-level notice * fix download resource file that under the directory error * Fix unfiltered jar files in resource directory and UDF upload resource parameters (#3008) * Change email to default * Fix unfiltered jar files in resource directory and UDF upload resource parameters * fix singe resource manager will NPE (#3013) * 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 * remove param monitor server state * fix table T_DS_ALERT * update h2 database * fix #2910 master server will show exception for some time when it restart * fix oom when no master is active * fix worker oom when master server restart * fix oom * fix * add UT * fix worker group config no effect * fix singe resource manager will NPE * Update HadoopUtilsTest.java * merge from dev-1.3.0 * update ut * remove duplicate code * remove exception ut * remove exception ut * remove exception ut * remove exception ut * remove exception ut * [bugfix] remove Conflicting configuration sudo and user (#3038) Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com> * [bugfix] 1. fix alert.json includes repeated tag 'DOLPHIN_ALERT' 2. metainfo.xml The version number of the RPM package is no longer specified in the metainfo.xml (#3032) Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com> * [feature] readme.md adds instructions for changing environment variables (#3031) Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com> * merge from dev * Change favicon.ico icon introduction method and package compilation to increase version number (#3030) Co-authored-by: Jiajie Zhong <zhongjiajie955@hotmail.com> Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com> Co-authored-by: chenxingchun <438044805@qq.com> Co-authored-by: break60 <790061044@qq.com> Co-authored-by: lgcareer <18610854716@163.com> Co-authored-by: bao liang <29528966+lenboo@users.noreply.github.com> Co-authored-by: baoliang <baoliang@analysys.com.cn> Co-authored-by: Simon <3656562@qq.com> Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com> Co-authored-by: 张世鸣 <zhangshiming@cvte.com> Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn> Co-authored-by: liwenhe1993 <liwenhe@apache.org> Co-authored-by: xiaochun.liu <xiaochun.liu@centurygame.com> Co-authored-by: lidongdai <escheduler@outlook.com> Co-authored-by: dailidong <dolphinschedule@gmail.com> Co-authored-by: Tboy <guo.jiwei@immomo.com> Co-authored-by: xuchangqun <58328021+xuchangqun@users.noreply.github.com> Co-authored-by: changqun.xu <changqun.xu@17zuoye.com> Co-authored-by: xuchangqun <changqun.x@gmail.com> Co-authored-by: zixi0825 <649790970@qq.com> Co-authored-by: sunchaohe <sunzhaohe@linklogis.com> Co-authored-by: zhangchunyang <zhangchunyang0123@gmail.com> Co-authored-by: tlhhup <137273278@qq.com> Co-authored-by: yelli.hl@foxmail.com <amarantine@my.com> Co-authored-by: eights <yelli.hl@foxmail.com> Co-authored-by: yaoyao <42244568+1445103710@users.noreply.github.com> Co-authored-by: 小清 <62982788+597365581@users.noreply.github.com> Co-authored-by: gabry.wu <gabrywu@apache.org> Co-authored-by: t1mon <178317391@qq.com> Co-authored-by: Rubik-W <39549317+Rubik-W@users.noreply.github.com> Co-authored-by: Rubik-W <whm_777@163.com> Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com>	4 years ago
dailidong	252d6c5003	add maven Xmx to 5g	4 years ago
xingchun-chen	6b8871b11d	update e2e chrome version (#2775) ... Co-authored-by: chenxingchun <438044805@qq.com>	4 years ago
kezhenxu94	80d14404e6	Exclude i18n files from code analysis	4 years ago
kezhenxu94	ce8945d24f	Reorder lint action	4 years ago
kezhenxu94	e11fda8af3	Add a script to check the license (#2552) ... * Add a script to check the license ### Motivation Check licenses in the distribution package ### Modification 1. Add a script to check licenses, and list known licenses. 1. Remove unused dep license, lombok. 1. Remove unnecessary ignored patterns in .gitignore. 1. Add missing config items to apache-rat plugin, which just checked a small part of files before. 1. Add check to GitHub Actions process ### Result 1. Newly-added dependencies should be checked and confirmed. 1. Closes #1578 * Separate rat and dependency check * Tee dependencies to stdout * Add more debug messages * Check light-weight task first	4 years ago
qiaozhanwei	8d46953599	modify ci_e2e.yml	4 years ago
khadgarmage	e37aecdbc7	add ds logs and server status check with e2e test (#2277)	4 years ago
khadgarmage	5d0f0e9490	Fix checkoutv2 push trigger on dev (#2263) ... * push trigger on dev	4 years ago
khadgarmage	416e0417ad	license and checkoutv2 fix (#2261)	4 years ago
Jave-Chen	ec93e70f2f	fix wrong sonar analysis with checkout V2. (#2148)	4 years ago
dailidong	d01e19321a	fix actions/checkout@v2 problem (#2095)	4 years ago
Jave-Chen	f1632e22c5	Set up JDK 11 for SonarCloud in github action. (#3052) ... * Set up JDK 11 for SonarCloud in github action. * Fix javadoc error with JDK 11. * Prevent Javadoc from stopping if it finds any html errors.	4 years ago
CalvinKirs	b21259d600	add MicroBenchMark model (#2851) ... * add MicroBenchMark model * add log * fix propertyName * small change * add ut * format * add @Test * fix maven compile error * remove enum set method * exclusion microbench ut * small change * Use assembly instead of shade Co-authored-by: dailidong <dailidong66@gmail.com>	5 years ago
khadgarmage	12c249ab47	fix ci log bug (#2901)	5 years ago
dailidong	12dc18bbac	add maven Xmx to 5g	5 years ago
xingchun-chen	714ad5d445	update e2e chrome version (#2778) ... * 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 * modify dataX environment variable * update e2e chrome version Co-authored-by: chenxingchun <438044805@qq.com>	5 years ago
xingchun-chen	da533044a6	update e2e chrome version (#2775) ... Co-authored-by: chenxingchun <438044805@qq.com>	5 years ago