Browse Source
* 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 commitdata_quality_designe367f90bb7. * 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 commit3a2cba7a* 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 commit3a2cba7a* 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 commitad2d9f99d0. * [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>
Kirs
3 years ago
committed by
GitHub
179 changed files with 3367 additions and 2861 deletions
@ -0,0 +1,43 @@
|
||||
# Licensed to Apache Software Foundation (ASF) under one or more contributor |
||||
# license agreements. See the NOTICE file distributed with |
||||
# this work for additional information regarding copyright |
||||
# ownership. Apache Software Foundation (ASF) licenses this file to you under |
||||
# the Apache License, Version 2.0 (the "License"); you may |
||||
# not use this file except in compliance with the License. |
||||
# You may obtain a copy of the License at |
||||
# |
||||
# http://www.apache.org/licenses/LICENSE-2.0 |
||||
# |
||||
# Unless required by applicable law or agreed to in writing, |
||||
# software distributed under the License is distributed on an |
||||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY |
||||
# KIND, either express or implied. See the License for the |
||||
# specific language governing permissions and limitations |
||||
# under the License. |
||||
|
||||
header: |
||||
license: |
||||
spdx-id: Apache-2.0 |
||||
copyright-owner: Apache Software Foundation |
||||
|
||||
paths-ignore: |
||||
- dist |
||||
- NOTICE |
||||
- LICENSE |
||||
- DISCLAIMER |
||||
- dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ScriptRunner.java |
||||
- mvnw.cmd |
||||
- sql/soft_version |
||||
- .mvn |
||||
- .gitattributes |
||||
- '**/licenses/**/LICENSE-*' |
||||
- '**/*.md' |
||||
- '**/*.json' |
||||
- '**/*.iml' |
||||
- '**/.babelrc' |
||||
- '**/.eslintignore' |
||||
- '**/.gitignore' |
||||
- '**/LICENSE' |
||||
- '**/NOTICE' |
||||
|
||||
comment: on-failure |
||||
@ -0,0 +1,25 @@
|
||||
# |
||||
# Licensed to the Apache Software Foundation (ASF) under one or more |
||||
# contributor license agreements. See the NOTICE file distributed with |
||||
# this work for additional information regarding copyright ownership. |
||||
# The ASF licenses this file to You under the Apache License, Version 2.0 |
||||
# (the "License"); you may not use this file except in compliance with |
||||
# the License. You may obtain a copy of the License at |
||||
# |
||||
# http://www.apache.org/licenses/LICENSE-2.0 |
||||
# |
||||
# Unless required by applicable law or agreed to in writing, software |
||||
# distributed under the License is distributed on an "AS IS" BASIS, |
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
# See the License for the specific language governing permissions and |
||||
# limitations under the License. |
||||
# |
||||
dependencies: |
||||
- name: postgresql |
||||
version: 8.x.x |
||||
repository: https://charts.bitnami.com/bitnami |
||||
condition: postgresql.enabled |
||||
- name: zookeeper |
||||
version: 5.x.x |
||||
repository: https://charts.bitnami.com/bitnami |
||||
condition: redis.enabled |
||||
@ -0,0 +1,25 @@
|
||||
# |
||||
# Licensed to the Apache Software Foundation (ASF) under one or more |
||||
# contributor license agreements. See the NOTICE file distributed with |
||||
# this work for additional information regarding copyright ownership. |
||||
# The ASF licenses this file to You under the Apache License, Version 2.0 |
||||
# (the "License"); you may not use this file except in compliance with |
||||
# the License. You may obtain a copy of the License at |
||||
# |
||||
# http://www.apache.org/licenses/LICENSE-2.0 |
||||
# |
||||
# Unless required by applicable law or agreed to in writing, software |
||||
# distributed under the License is distributed on an "AS IS" BASIS, |
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
# See the License for the specific language governing permissions and |
||||
# limitations under the License. |
||||
# |
||||
dependencies: |
||||
- name: postgresql |
||||
version: 8.x.x |
||||
repository: https://charts.bitnami.com/bitnami |
||||
condition: postgresql.enabled |
||||
- name: zookeeper |
||||
version: 5.x.x |
||||
repository: https://charts.bitnami.com/bitnami |
||||
condition: redis.enabled |
||||
@ -1,352 +0,0 @@
|
||||
///*
|
||||
// * Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
// * contributor license agreements. See the NOTICE file distributed with
|
||||
// * this work for additional information regarding copyright ownership.
|
||||
// * The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
// * (the "License"); you may not use this file except in compliance with
|
||||
// * the License. You may obtain a copy of the License at
|
||||
// *
|
||||
// * http://www.apache.org/licenses/LICENSE-2.0
|
||||
// *
|
||||
// * Unless required by applicable law or agreed to in writing, software
|
||||
// * distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// * See the License for the specific language governing permissions and
|
||||
// * limitations under the License.
|
||||
// */
|
||||
//package org.apache.dolphinscheduler.alert.utils;
|
||||
//
|
||||
//import org.apache.dolphinscheduler.alert.template.AlertTemplate;
|
||||
//import org.apache.dolphinscheduler.alert.template.AlertTemplateFactory;
|
||||
//import org.apache.dolphinscheduler.common.enums.ShowType;
|
||||
//import org.apache.commons.mail.EmailException;
|
||||
//import org.apache.commons.mail.HtmlEmail;
|
||||
//import org.apache.dolphinscheduler.common.utils.CollectionUtils;
|
||||
//import org.apache.dolphinscheduler.common.utils.StringUtils;
|
||||
//import org.slf4j.Logger;
|
||||
//import org.slf4j.LoggerFactory;
|
||||
//
|
||||
//import javax.mail.*;
|
||||
//import javax.mail.internet.*;
|
||||
//import java.io.*;
|
||||
//import java.util.*;
|
||||
//
|
||||
//
|
||||
///**
|
||||
// * mail utils
|
||||
// */
|
||||
//public class MailUtils {
|
||||
//
|
||||
// public static final Logger logger = LoggerFactory.getLogger(MailUtils.class);
|
||||
//
|
||||
// public static final String MAIL_PROTOCOL = PropertyUtils.getString(Constants.MAIL_PROTOCOL);
|
||||
//
|
||||
// public static final String MAIL_SERVER_HOST = PropertyUtils.getString(Constants.MAIL_SERVER_HOST);
|
||||
//
|
||||
// public static final Integer MAIL_SERVER_PORT = PropertyUtils.getInt(Constants.MAIL_SERVER_PORT);
|
||||
//
|
||||
// public static final String MAIL_SENDER = PropertyUtils.getString(Constants.MAIL_SENDER);
|
||||
//
|
||||
// public static final String MAIL_USER = PropertyUtils.getString(Constants.MAIL_USER);
|
||||
//
|
||||
// public static final String MAIL_PASSWD = PropertyUtils.getString(Constants.MAIL_PASSWD);
|
||||
//
|
||||
// public static final Boolean MAIL_USE_START_TLS = PropertyUtils.getBoolean(Constants.MAIL_SMTP_STARTTLS_ENABLE);
|
||||
//
|
||||
// public static final Boolean MAIL_USE_SSL = PropertyUtils.getBoolean(Constants.MAIL_SMTP_SSL_ENABLE);
|
||||
//
|
||||
// public static final String xlsFilePath = PropertyUtils.getString(Constants.XLS_FILE_PATH,"/tmp/xls");
|
||||
//
|
||||
// public static final String STARTTLS_ENABLE = PropertyUtils.getString(Constants.MAIL_SMTP_STARTTLS_ENABLE);
|
||||
//
|
||||
// public static final Boolean SSL_ENABLE = PropertyUtils.getBoolean(Constants.MAIL_SMTP_SSL_ENABLE);
|
||||
//
|
||||
// public static final String SSL_TRUST = PropertyUtils.getString(Constants.MAIL_SMTP_SSL_TRUST);
|
||||
//
|
||||
// public static final AlertTemplate alertTemplate = AlertTemplateFactory.getMessageTemplate();
|
||||
//
|
||||
// //Solve the problem of messy Chinese name in excel attachment
|
||||
// static {
|
||||
// System.setProperty("mail.mime.splitlongparameters","false");
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * send mail to receivers
|
||||
// * @param receivers the receiver list
|
||||
// * @param title the title
|
||||
// * @param content the content
|
||||
// * @param showType the show type
|
||||
// * @return the result map
|
||||
// */
|
||||
// public static Map<String,Object> sendMails(Collection<String> receivers, String title, String content,String showType) {
|
||||
// return sendMails(receivers, null, title, content, showType);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * send mail
|
||||
// * @param receivers the receiver list
|
||||
// * @param receiversCc cc list
|
||||
// * @param title the title
|
||||
// * @param content the content
|
||||
// * @param showType the show type
|
||||
// * @return the send result
|
||||
// */
|
||||
// public static Map<String,Object> sendMails(Collection<String> receivers, Collection<String> receiversCc, String title, String content, String showType) {
|
||||
// Map<String,Object> retMap = new HashMap<>();
|
||||
// retMap.put(Constants.STATUS, false);
|
||||
//
|
||||
// // if there is no receivers && no receiversCc, no need to process
|
||||
// if (CollectionUtils.isEmpty(receivers) && CollectionUtils.isEmpty(receiversCc)) {
|
||||
// return retMap;
|
||||
// }
|
||||
//
|
||||
// receivers.removeIf(StringUtils::isEmpty);
|
||||
//
|
||||
// if (showType.equals(ShowType.TABLE.getDescp()) || showType.equals(ShowType.TEXT.getDescp())) {
|
||||
// // send email
|
||||
// HtmlEmail email = new HtmlEmail();
|
||||
//
|
||||
// try {
|
||||
// Session session = getSession();
|
||||
// email.setMailSession(session);
|
||||
// email.setFrom(MAIL_SENDER);
|
||||
// email.setCharset(Constants.UTF_8);
|
||||
// if (CollectionUtils.isNotEmpty(receivers)){
|
||||
// // receivers mail
|
||||
// for (String receiver : receivers) {
|
||||
// email.addTo(receiver);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// if (CollectionUtils.isNotEmpty(receiversCc)){
|
||||
// //cc
|
||||
// for (String receiverCc : receiversCc) {
|
||||
// email.addCc(receiverCc);
|
||||
// }
|
||||
// }
|
||||
// // sender mail
|
||||
// return getStringObjectMap(title, content, showType, retMap, email);
|
||||
// } catch (Exception e) {
|
||||
// handleException(receivers, retMap, e);
|
||||
// }
|
||||
// }else if (showType.equals(ShowType.ATTACHMENT.getDescp()) || showType.equals(ShowType.TABLEATTACHMENT.getDescp())) {
|
||||
// try {
|
||||
//
|
||||
// String partContent = (showType.equals(ShowType.ATTACHMENT.getDescp()) ? "Please see the attachment " + title + Constants.EXCEL_SUFFIX_XLS : htmlTable(content,false));
|
||||
//
|
||||
// attachment(receivers,receiversCc,title,content,partContent);
|
||||
//
|
||||
// retMap.put(Constants.STATUS, true);
|
||||
// return retMap;
|
||||
// }catch (Exception e){
|
||||
// handleException(receivers, retMap, e);
|
||||
// return retMap;
|
||||
// }
|
||||
// }
|
||||
// return retMap;
|
||||
//
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * html table content
|
||||
// * @param content the content
|
||||
// * @param showAll if show the whole content
|
||||
// * @return the html table form
|
||||
// */
|
||||
// private static String htmlTable(String content, boolean showAll){
|
||||
// return alertTemplate.getMessageFromTemplate(content,ShowType.TABLE,showAll);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * html table content
|
||||
// * @param content the content
|
||||
// * @return the html table form
|
||||
// */
|
||||
// private static String htmlTable(String content){
|
||||
// return htmlTable(content,true);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * html text content
|
||||
// * @param content the content
|
||||
// * @return text in html form
|
||||
// */
|
||||
// private static String htmlText(String content){
|
||||
// return alertTemplate.getMessageFromTemplate(content,ShowType.TEXT);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * send mail as Excel attachment
|
||||
// * @param receivers the receiver list
|
||||
// * @param title the title
|
||||
// * @throws Exception
|
||||
// */
|
||||
// private static void attachment(Collection<String> receivers,Collection<String> receiversCc,String title,String content,String partContent)throws Exception{
|
||||
// MimeMessage msg = getMimeMessage(receivers);
|
||||
//
|
||||
// attachContent(receiversCc, title, content,partContent, msg);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * get MimeMessage
|
||||
// * @param receivers receivers
|
||||
// * @return the MimeMessage
|
||||
// * @throws MessagingException
|
||||
// */
|
||||
// private static MimeMessage getMimeMessage(Collection<String> receivers) throws MessagingException {
|
||||
//
|
||||
// // 1. The first step in creating mail: creating session
|
||||
// Session session = getSession();
|
||||
// // Setting debug mode, can be turned off
|
||||
// session.setDebug(false);
|
||||
//
|
||||
// // 2. creating mail: Creating a MimeMessage
|
||||
// MimeMessage msg = new MimeMessage(session);
|
||||
// // 3. set sender
|
||||
// msg.setFrom(new InternetAddress(MAIL_SENDER));
|
||||
// // 4. set receivers
|
||||
// for (String receiver : receivers) {
|
||||
// msg.addRecipients(Message.RecipientType.TO, InternetAddress.parse(receiver));
|
||||
// }
|
||||
// return msg;
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * get session
|
||||
// *
|
||||
// * @return the new Session
|
||||
// */
|
||||
// private static Session getSession() {
|
||||
// Properties props = new Properties();
|
||||
// props.setProperty(Constants.MAIL_HOST, MAIL_SERVER_HOST);
|
||||
// props.setProperty(Constants.MAIL_PORT, String.valueOf(MAIL_SERVER_PORT));
|
||||
// props.setProperty(Constants.MAIL_SMTP_AUTH, Constants.STRING_TRUE);
|
||||
// props.setProperty(Constants.MAIL_TRANSPORT_PROTOCOL, MAIL_PROTOCOL);
|
||||
// props.setProperty(Constants.MAIL_SMTP_STARTTLS_ENABLE, STARTTLS_ENABLE);
|
||||
// if (SSL_ENABLE) {
|
||||
// props.setProperty(Constants.MAIL_SMTP_SSL_ENABLE, "true");
|
||||
// props.setProperty(Constants.MAIL_SMTP_SSL_TRUST, SSL_TRUST);
|
||||
// }
|
||||
//
|
||||
// Authenticator auth = new Authenticator() {
|
||||
// @Override
|
||||
// protected PasswordAuthentication getPasswordAuthentication() {
|
||||
// // mail username and password
|
||||
// return new PasswordAuthentication(MAIL_USER, MAIL_PASSWD);
|
||||
// }
|
||||
// };
|
||||
//
|
||||
// return Session.getInstance(props, auth);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * attach content
|
||||
// * @param receiversCc the cc list
|
||||
// * @param title the title
|
||||
// * @param content the content
|
||||
// * @param partContent the partContent
|
||||
// * @param msg the message
|
||||
// * @throws MessagingException
|
||||
// * @throws IOException
|
||||
// */
|
||||
// private static void attachContent(Collection<String> receiversCc, String title, String content, String partContent,MimeMessage msg) throws MessagingException, IOException {
|
||||
// /**
|
||||
// * set receiverCc
|
||||
// */
|
||||
// if(CollectionUtils.isNotEmpty(receiversCc)){
|
||||
// for (String receiverCc : receiversCc){
|
||||
// msg.addRecipients(Message.RecipientType.CC, InternetAddress.parse(receiverCc));
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// // set subject
|
||||
// msg.setSubject(title);
|
||||
// MimeMultipart partList = new MimeMultipart();
|
||||
// // set signature
|
||||
// MimeBodyPart part1 = new MimeBodyPart();
|
||||
// part1.setContent(partContent, Constants.TEXT_HTML_CHARSET_UTF_8);
|
||||
// // set attach file
|
||||
// MimeBodyPart part2 = new MimeBodyPart();
|
||||
// File file = new File(xlsFilePath + Constants.SINGLE_SLASH + title + Constants.EXCEL_SUFFIX_XLS);
|
||||
// if (!file.getParentFile().exists()) {
|
||||
// file.getParentFile().mkdirs();
|
||||
// }
|
||||
// // make excel file
|
||||
//
|
||||
// ExcelUtils.genExcelFile(content,title,xlsFilePath);
|
||||
//
|
||||
// part2.attachFile(file);
|
||||
// part2.setFileName(MimeUtility.encodeText(title + Constants.EXCEL_SUFFIX_XLS,Constants.UTF_8,"B"));
|
||||
// // add components to collection
|
||||
// partList.addBodyPart(part1);
|
||||
// partList.addBodyPart(part2);
|
||||
// msg.setContent(partList);
|
||||
// // 5. send Transport
|
||||
// Transport.send(msg);
|
||||
// // 6. delete saved file
|
||||
// deleteFile(file);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * the string object map
|
||||
// * @param title the title
|
||||
// * @param content the content
|
||||
// * @param showType the showType
|
||||
// * @param retMap the result map
|
||||
// * @param email the email
|
||||
// * @return the result map
|
||||
// * @throws EmailException
|
||||
// */
|
||||
// private static Map<String, Object> getStringObjectMap(String title, String content, String showType, Map<String, Object> retMap, HtmlEmail email) throws EmailException {
|
||||
//
|
||||
// /**
|
||||
// * the subject of the message to be sent
|
||||
// */
|
||||
// email.setSubject(title);
|
||||
// /**
|
||||
// * to send information, you can use HTML tags in mail content because of the use of HtmlEmail
|
||||
// */
|
||||
// if (showType.equals(ShowType.TABLE.getDescp())) {
|
||||
// email.setMsg(htmlTable(content));
|
||||
// } else if (showType.equals(ShowType.TEXT.getDescp())) {
|
||||
// email.setMsg(htmlText(content));
|
||||
// }
|
||||
//
|
||||
// // send
|
||||
// email.send();
|
||||
//
|
||||
// retMap.put(Constants.STATUS, true);
|
||||
//
|
||||
// return retMap;
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * file delete
|
||||
// * @param file the file to delete
|
||||
// */
|
||||
// public static void deleteFile(File file){
|
||||
// if(file.exists()){
|
||||
// if(file.delete()){
|
||||
// logger.info("delete success: {}",file.getAbsolutePath() + file.getName());
|
||||
// }else{
|
||||
// logger.info("delete fail: {}", file.getAbsolutePath() + file.getName());
|
||||
// }
|
||||
// }else{
|
||||
// logger.info("file not exists: {}", file.getAbsolutePath() + file.getName());
|
||||
// }
|
||||
// }
|
||||
//
|
||||
//
|
||||
// /**
|
||||
// * handle exception
|
||||
// * @param receivers the receiver list
|
||||
// * @param retMap the result map
|
||||
// * @param e the exception
|
||||
// */
|
||||
// private static void handleException(Collection<String> receivers, Map<String, Object> retMap, Exception e) {
|
||||
// logger.error("Send email to {} failed", receivers, e);
|
||||
// retMap.put(Constants.MESSAGE, "Send email to {" + String.join(",", receivers) + "} failed，" + e.toString());
|
||||
// }
|
||||
//
|
||||
//
|
||||
//}
|
||||
@ -0,0 +1,117 @@
|
||||
/* |
||||
* Licensed to the Apache Software Foundation (ASF) under one or more |
||||
* contributor license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright ownership. |
||||
* The ASF licenses this file to You under the Apache License, Version 2.0 |
||||
* (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package org.apache.dolphinscheduler.api.vo; |
||||
|
||||
import java.util.Date; |
||||
|
||||
/** |
||||
* AlertPluginInstanceVO |
||||
*/ |
||||
public class AlertPluginInstanceVO { |
||||
|
||||
/** |
||||
* id |
||||
*/ |
||||
private int id; |
||||
|
||||
/** |
||||
* plugin_define_id |
||||
*/ |
||||
private int pluginDefineId; |
||||
|
||||
/** |
||||
* alert plugin instance name |
||||
*/ |
||||
private String instanceName; |
||||
|
||||
/** |
||||
* plugin_instance_params |
||||
*/ |
||||
private String pluginInstanceParams; |
||||
|
||||
/** |
||||
* create_time |
||||
*/ |
||||
private Date createTime; |
||||
|
||||
/** |
||||
* update_time |
||||
*/ |
||||
private Date updateTime; |
||||
|
||||
/** |
||||
* alert plugin name |
||||
*/ |
||||
private String alertPluginName; |
||||
|
||||
public int getId() { |
||||
return id; |
||||
} |
||||
|
||||
public void setId(int id) { |
||||
this.id = id; |
||||
} |
||||
|
||||
public int getPluginDefineId() { |
||||
return pluginDefineId; |
||||
} |
||||
|
||||
public void setPluginDefineId(int pluginDefineId) { |
||||
this.pluginDefineId = pluginDefineId; |
||||
} |
||||
|
||||
public String getInstanceName() { |
||||
return instanceName; |
||||
} |
||||
|
||||
public void setInstanceName(String instanceName) { |
||||
this.instanceName = instanceName; |
||||
} |
||||
|
||||
public String getPluginInstanceParams() { |
||||
return pluginInstanceParams; |
||||
} |
||||
|
||||
public void setPluginInstanceParams(String pluginInstanceParams) { |
||||
this.pluginInstanceParams = pluginInstanceParams; |
||||
} |
||||
|
||||
public Date getCreateTime() { |
||||
return createTime; |
||||
} |
||||
|
||||
public void setCreateTime(Date createTime) { |
||||
this.createTime = createTime; |
||||
} |
||||
|
||||
public Date getUpdateTime() { |
||||
return updateTime; |
||||
} |
||||
|
||||
public void setUpdateTime(Date updateTime) { |
||||
this.updateTime = updateTime; |
||||
} |
||||
|
||||
public String getAlertPluginName() { |
||||
return alertPluginName; |
||||
} |
||||
|
||||
public void setAlertPluginName(String alertPluginName) { |
||||
this.alertPluginName = alertPluginName; |
||||
} |
||||
} |
||||
@ -0,0 +1,45 @@
|
||||
/* |
||||
* Licensed to the Apache Software Foundation (ASF) under one or more |
||||
* contributor license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright ownership. |
||||
* The ASF licenses this file to You under the Apache License, Version 2.0 |
||||
* (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0 |
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package org.apache.dolphinscheduler.api.security; |
||||
|
||||
import org.apache.dolphinscheduler.api.ApiApplicationServer; |
||||
|
||||
import org.junit.Assert; |
||||
import org.junit.Test; |
||||
import org.junit.runner.RunWith; |
||||
import org.springframework.beans.factory.annotation.Autowired; |
||||
import org.springframework.boot.test.context.SpringBootTest; |
||||
import org.springframework.test.context.TestPropertySource; |
||||
import org.springframework.test.context.junit4.SpringRunner; |
||||
|
||||
@RunWith(SpringRunner.class) |
||||
@SpringBootTest(classes = ApiApplicationServer.class) |
||||
@TestPropertySource(properties = { |
||||
"security.authentication.type=LDAP", |
||||
}) |
||||
public class SecurityConfigLDAPTest { |
||||
|
||||
@Autowired |
||||
private SecurityConfig securityConfig; |
||||
|
||||
@Test |
||||
public void testAuthenticator() { |
||||
Authenticator authenticator = securityConfig.authenticator(); |
||||
Assert.assertNotNull(authenticator); |
||||
} |
||||
} |
||||
@ -0,0 +1,45 @@
|
||||
/* |
||||
* Licensed to the Apache Software Foundation (ASF) under one or more |
||||
* contributor license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright ownership. |
||||
* The ASF licenses this file to You under the Apache License, Version 2.0 |
||||
* (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0 |
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package org.apache.dolphinscheduler.api.security; |
||||
|
||||
import org.apache.dolphinscheduler.api.ApiApplicationServer; |
||||
|
||||
import org.junit.Assert; |
||||
import org.junit.Test; |
||||
import org.junit.runner.RunWith; |
||||
import org.springframework.beans.factory.annotation.Autowired; |
||||
import org.springframework.boot.test.context.SpringBootTest; |
||||
import org.springframework.test.context.TestPropertySource; |
||||
import org.springframework.test.context.junit4.SpringRunner; |
||||
|
||||
@RunWith(SpringRunner.class) |
||||
@SpringBootTest(classes = ApiApplicationServer.class) |
||||
@TestPropertySource(properties = { |
||||
"security.authentication.type=LDAP", |
||||
}) |
||||
public class SecurityConfigLDAPTest { |
||||
|
||||
@Autowired |
||||
private SecurityConfig securityConfig; |
||||
|
||||
@Test |
||||
public void testAuthenticator() { |
||||
Authenticator authenticator = securityConfig.authenticator(); |
||||
Assert.assertNotNull(authenticator); |
||||
} |
||||
} |
||||
@ -0,0 +1,87 @@
|
||||
/* |
||||
* Licensed to the Apache Software Foundation (ASF) under one or more |
||||
* contributor license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright ownership. |
||||
* The ASF licenses this file to You under the Apache License, Version 2.0 |
||||
* (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package org.apache.dolphinscheduler.common.utils; |
||||
|
||||
import org.apache.hadoop.hive.conf.HiveConf; |
||||
import org.apache.hadoop.hive.conf.HiveConf.ConfVars; |
||||
|
||||
import java.util.Arrays; |
||||
import java.util.HashMap; |
||||
import java.util.Map; |
||||
import java.util.regex.Matcher; |
||||
import java.util.regex.Pattern; |
||||
|
||||
/** |
||||
* hive conf utils |
||||
*/ |
||||
public class HiveConfUtils { |
||||
|
||||
private HiveConfUtils() { |
||||
throw new UnsupportedOperationException("Construct HiveConfUtils"); |
||||
} |
||||
|
||||
private static class HiveConfHandler { |
||||
private static HiveConf singleton; |
||||
|
||||
private static Map<String,Object> hiveConfVars; |
||||
|
||||
static { |
||||
singleton = new HiveConf(); |
||||
hiveConfVars = new HashMap<>(); |
||||
Arrays.stream(ConfVars.values()).forEach(confVar -> hiveConfVars.put(confVar.varname,confVar)); |
||||
} |
||||
} |
||||
|
||||
/** |
||||
* get HiveConf instance |
||||
* @return HiveConf hiveConf |
||||
*/ |
||||
public static HiveConf getInstance() { |
||||
return HiveConfHandler.singleton; |
||||
} |
||||
|
||||
/** |
||||
* get hive conf vars |
||||
* @return |
||||
*/ |
||||
public static Map<String,Object> getHiveConfVars() { |
||||
return HiveConfHandler.hiveConfVars; |
||||
} |
||||
|
||||
/** |
||||
* Determine if it belongs to a hive conf property |
||||
* @param conf config |
||||
* @return boolean result |
||||
*/ |
||||
public static boolean isHiveConfVar(String conf) { |
||||
// the default hive conf var name
|
||||
String confKey = conf.split("=")[0]; |
||||
Map<String, Object> hiveConfVars = HiveConfUtils.getHiveConfVars(); |
||||
if (hiveConfVars.get(confKey) != null) { |
||||
return true; |
||||
} |
||||
|
||||
// the security authorization hive conf var name
|
||||
HiveConf hiveConf = HiveConfUtils.getInstance(); |
||||
String hiveAuthorizationSqlStdAuthConfigWhitelist = hiveConf.getVar(HiveConf.ConfVars.HIVE_AUTHORIZATION_SQL_STD_AUTH_CONFIG_WHITELIST); |
||||
Pattern modWhiteListPattern = Pattern.compile(hiveAuthorizationSqlStdAuthConfigWhitelist); |
||||
Matcher matcher = modWhiteListPattern.matcher(confKey); |
||||
return matcher.matches(); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,47 @@
|
||||
/* |
||||
* Licensed to the Apache Software Foundation (ASF) under one or more |
||||
* contributor license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright ownership. |
||||
* The ASF licenses this file to You under the Apache License, Version 2.0 |
||||
* (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package org.apache.dolphinscheduler.common.utils; |
||||
|
||||
import org.junit.Assert; |
||||
import org.junit.Test; |
||||
|
||||
/** |
||||
* hive conf utils test |
||||
*/ |
||||
public class HiveConfUtilsTest { |
||||
|
||||
/** |
||||
* test is hive conf var |
||||
*/ |
||||
@Test |
||||
public void testIsHiveConfVar() { |
||||
|
||||
String conf = "hive.exec.script.wrapper=123"; |
||||
boolean hiveConfVar = HiveConfUtils.isHiveConfVar(conf); |
||||
Assert.assertTrue(hiveConfVar); |
||||
|
||||
conf = "hive.test.v1=v1"; |
||||
hiveConfVar = HiveConfUtils.isHiveConfVar(conf); |
||||
Assert.assertFalse(hiveConfVar); |
||||
|
||||
conf = "tez.queue.name=tezQueue"; |
||||
hiveConfVar = HiveConfUtils.isHiveConfVar(conf); |
||||
Assert.assertTrue(hiveConfVar); |
||||
|
||||
} |
||||
} |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue